EDIT / kanjai · Commits

Commit 7f7d849c3632572b65cc8f7c996e00737c6443fe

Authored by Karpikau Andrei
1 parent abc3ea5f

check private and public page show

Inline Side-by-side
Showing 4 changed files with 59 additions and 227 deletions
... ... @@ -34,10 +34,10 @@
34 34 </provider>
35 35 </entry>
36 36 </file>
37   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  37 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
38 38 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
39 39 <provider selected="true" editor-type-id="text-editor">
40   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  40 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
41 41 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
42 42 <folding />
43 43 </state>
... ... @@ -47,38 +47,38 @@
47 47 <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
48 48 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
49 49 <provider selected="true" editor-type-id="text-editor">
50   - <state vertical-scroll-proportion="0.0" vertical-offset="731" max-vertical-offset="1425">
  50 + <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="1425">
51 51 <caret line="83" column="35" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" />
52 52 <folding />
53 53 </state>
54 54 </provider>
55 55 </entry>
56 56 </file>
57   - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  57 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="true">
58 58 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
59 59 <provider selected="true" editor-type-id="text-editor">
60   - <state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="4005">
61   - <caret line="90" column="43" selection-start-line="89" selection-start-column="0" selection-end-line="90" selection-end-column="43" />
  60 + <state vertical-scroll-proportion="0.47791797" vertical-offset="2172" max-vertical-offset="4005">
  61 + <caret line="165" column="94" selection-start-line="165" selection-start-column="94" selection-end-line="165" selection-end-column="94" />
62 62 <folding />
63 63 </state>
64 64 </provider>
65 65 </entry>
66 66 </file>
67   - <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
68   - <entry file="file://$PROJECT_DIR$/config/routes.rb">
  67 + <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">
  68 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
69 69 <provider selected="true" editor-type-id="text-editor">
70   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
71   - <caret line="9" column="72" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="72" />
  70 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  71 + <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
72 72 <folding />
73 73 </state>
74 74 </provider>
75 75 </entry>
76 76 </file>
77   - <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">
78   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  77 + <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
  78 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
79 79 <provider selected="true" editor-type-id="text-editor">
80   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
81   - <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
  80 + <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="900">
  81 + <caret line="9" column="72" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="72" />
82 82 <folding />
83 83 </state>
84 84 </provider>
... ... @@ -117,8 +117,8 @@
117 117 <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
118 118 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
119 119 <provider selected="true" editor-type-id="text-editor">
120   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="855">
121   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  120 + <state vertical-scroll-proportion="0.0" vertical-offset="135" max-vertical-offset="885">
  121 + <caret line="32" column="22" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="22" />
122 122 <folding />
123 123 </state>
124 124 </provider>
... ... @@ -129,7 +129,6 @@
129 129 <component name="IdeDocumentHistory">
130 130 <option name="CHANGED_PATHS">
131 131 <list>
132   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
133 132 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
134 133 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
135 134 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
... ... @@ -174,12 +173,13 @@
174 173 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
175 174 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" />
176 175 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
177   - <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
178 176 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />
179 177 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
180 178 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
181 179 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
182 180 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
  181 + <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  182 + <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
183 183 </list>
184 184 </option>
185 185 </component>
... ... @@ -244,158 +244,6 @@
244 244 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
245 245 </PATH_ELEMENT>
246 246 <PATH_ELEMENT>
247   - <option name="myItemId" value="lib" />
248   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
249   - </PATH_ELEMENT>
250   - </PATH>
251   - <PATH>
252   - <PATH_ELEMENT>
253   - <option name="myItemId" value="kanjai" />
254   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
255   - </PATH_ELEMENT>
256   - <PATH_ELEMENT>
257   - <option name="myItemId" value="kanjai" />
258   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
259   - </PATH_ELEMENT>
260   - <PATH_ELEMENT>
261   - <option name="myItemId" value="lib" />
262   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
263   - </PATH_ELEMENT>
264   - <PATH_ELEMENT>
265   - <option name="myItemId" value="tasks" />
266   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
267   - </PATH_ELEMENT>
268   - </PATH>
269   - <PATH>
270   - <PATH_ELEMENT>
271   - <option name="myItemId" value="kanjai" />
272   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
273   - </PATH_ELEMENT>
274   - <PATH_ELEMENT>
275   - <option name="myItemId" value="kanjai" />
276   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
277   - </PATH_ELEMENT>
278   - <PATH_ELEMENT>
279   - <option name="myItemId" value="lib" />
280   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
281   - </PATH_ELEMENT>
282   - <PATH_ELEMENT>
283   - <option name="myItemId" value="kanjai" />
284   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
285   - </PATH_ELEMENT>
286   - </PATH>
287   - <PATH>
288   - <PATH_ELEMENT>
289   - <option name="myItemId" value="kanjai" />
290   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
291   - </PATH_ELEMENT>
292   - <PATH_ELEMENT>
293   - <option name="myItemId" value="kanjai" />
294   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
295   - </PATH_ELEMENT>
296   - <PATH_ELEMENT>
297   - <option name="myItemId" value="config" />
298   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
299   - </PATH_ELEMENT>
300   - </PATH>
301   - <PATH>
302   - <PATH_ELEMENT>
303   - <option name="myItemId" value="kanjai" />
304   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
305   - </PATH_ELEMENT>
306   - <PATH_ELEMENT>
307   - <option name="myItemId" value="kanjai" />
308   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
309   - </PATH_ELEMENT>
310   - <PATH_ELEMENT>
311   - <option name="myItemId" value="app" />
312   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
313   - </PATH_ELEMENT>
314   - <PATH_ELEMENT>
315   - <option name="myItemId" value="views" />
316   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
317   - </PATH_ELEMENT>
318   - </PATH>
319   - <PATH>
320   - <PATH_ELEMENT>
321   - <option name="myItemId" value="kanjai" />
322   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
323   - </PATH_ELEMENT>
324   - <PATH_ELEMENT>
325   - <option name="myItemId" value="kanjai" />
326   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
327   - </PATH_ELEMENT>
328   - <PATH_ELEMENT>
329   - <option name="myItemId" value="app" />
330   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
331   - </PATH_ELEMENT>
332   - <PATH_ELEMENT>
333   - <option name="myItemId" value="views" />
334   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
335   - </PATH_ELEMENT>
336   - <PATH_ELEMENT>
337   - <option name="myItemId" value="kanjai" />
338   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
339   - </PATH_ELEMENT>
340   - <PATH_ELEMENT>
341   - <option name="myItemId" value="shared" />
342   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
343   - </PATH_ELEMENT>
344   - </PATH>
345   - <PATH>
346   - <PATH_ELEMENT>
347   - <option name="myItemId" value="kanjai" />
348   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
349   - </PATH_ELEMENT>
350   - <PATH_ELEMENT>
351   - <option name="myItemId" value="kanjai" />
352   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
353   - </PATH_ELEMENT>
354   - <PATH_ELEMENT>
355   - <option name="myItemId" value="app" />
356   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
357   - </PATH_ELEMENT>
358   - <PATH_ELEMENT>
359   - <option name="myItemId" value="views" />
360   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
361   - </PATH_ELEMENT>
362   - <PATH_ELEMENT>
363   - <option name="myItemId" value="kanjai" />
364   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
365   - </PATH_ELEMENT>
366   - </PATH>
367   - <PATH>
368   - <PATH_ELEMENT>
369   - <option name="myItemId" value="kanjai" />
370   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
371   - </PATH_ELEMENT>
372   - <PATH_ELEMENT>
373   - <option name="myItemId" value="kanjai" />
374   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
375   - </PATH_ELEMENT>
376   - <PATH_ELEMENT>
377   - <option name="myItemId" value="app" />
378   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
379   - </PATH_ELEMENT>
380   - <PATH_ELEMENT>
381   - <option name="myItemId" value="models" />
382   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
383   - </PATH_ELEMENT>
384   - <PATH_ELEMENT>
385   - <option name="myItemId" value="kanjai" />
386   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
387   - </PATH_ELEMENT>
388   - </PATH>
389   - <PATH>
390   - <PATH_ELEMENT>
391   - <option name="myItemId" value="kanjai" />
392   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
393   - </PATH_ELEMENT>
394   - <PATH_ELEMENT>
395   - <option name="myItemId" value="kanjai" />
396   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
397   - </PATH_ELEMENT>
398   - <PATH_ELEMENT>
399 247 <option name="myItemId" value="app" />
400 248 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
401 249 </PATH_ELEMENT>
... ... @@ -422,24 +270,6 @@
422 270 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
423 271 </PATH_ELEMENT>
424 272 </PATH>
425   - <PATH>
426   - <PATH_ELEMENT>
427   - <option name="myItemId" value="kanjai" />
428   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
429   - </PATH_ELEMENT>
430   - <PATH_ELEMENT>
431   - <option name="myItemId" value="kanjai" />
432   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
433   - </PATH_ELEMENT>
434   - <PATH_ELEMENT>
435   - <option name="myItemId" value="app" />
436   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
437   - </PATH_ELEMENT>
438   - <PATH_ELEMENT>
439   - <option name="myItemId" value="assets" />
440   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
441   - </PATH_ELEMENT>
442   - </PATH>
443 273 </subPane>
444 274 </pane>
445 275 </panes>
... ... @@ -625,20 +455,20 @@
625 455 <layout>
626 456 <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" />
627 457 <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" />
628   - <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" />
629 458 <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" />
  459 + <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" />
  460 + <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" />
  461 + <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" />
  462 + <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" />
  463 + <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" />
  464 + <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" />
630 465 <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" />
631 466 <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" />
632 467 <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27382874" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
633   - <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" />
634 468 <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" />
635   - <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" />
636   - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
637   - <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" />
638 469 <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" />
639 470 <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" />
640 471 <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" />
641   - <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" />
642 472 <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" />
643 473 <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" />
644 474 <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" />
... ... @@ -970,50 +800,50 @@
970 800 </state>
971 801 </provider>
972 802 </entry>
973   - <entry file="file://$PROJECT_DIR$/config/routes.rb">
  803 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
974 804 <provider selected="true" editor-type-id="text-editor">
975   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
976   - <caret line="9" column="72" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="72" />
  805 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  806 + <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
977 807 <folding />
978 808 </state>
979 809 </provider>
980 810 </entry>
981   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  811 + <entry file="file://$PROJECT_DIR$/Gemfile">
982 812 <provider selected="true" editor-type-id="text-editor">
983   - <state vertical-scroll-proportion="0.0" vertical-offset="885" max-vertical-offset="4005">
984   - <caret line="90" column="43" selection-start-line="89" selection-start-column="0" selection-end-line="90" selection-end-column="43" />
  813 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  814 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
985 815 <folding />
986 816 </state>
987 817 </provider>
988 818 </entry>
989   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
  819 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
990 820 <provider selected="true" editor-type-id="text-editor">
991   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
992   - <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
  821 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
  822 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
993 823 <folding />
994 824 </state>
995 825 </provider>
996 826 </entry>
997   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  827 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
998 828 <provider selected="true" editor-type-id="text-editor">
999   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2160">
1000   - <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
  829 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
  830 + <caret line="9" column="72" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="72" />
1001 831 <folding />
1002 832 </state>
1003 833 </provider>
1004 834 </entry>
1005   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  835 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1006 836 <provider selected="true" editor-type-id="text-editor">
1007   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="855">
1008   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  837 + <state vertical-scroll-proportion="0.0" vertical-offset="1526" max-vertical-offset="2160">
  838 + <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
1009 839 <folding />
1010 840 </state>
1011 841 </provider>
1012 842 </entry>
1013   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  843 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
1014 844 <provider selected="true" editor-type-id="text-editor">
1015   - <state vertical-scroll-proportion="0.0" vertical-offset="731" max-vertical-offset="1425">
1016   - <caret line="83" column="35" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" />
  845 + <state vertical-scroll-proportion="0.0" vertical-offset="135" max-vertical-offset="885">
  846 + <caret line="32" column="22" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="22" />
1017 847 <folding />
1018 848 </state>
1019 849 </provider>
... ... @@ -1021,23 +851,23 @@
1021 851 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
1022 852 <provider selected="true" editor-type-id="text-editor">
1023 853 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
1024   - <caret line="12" column="17" selection-start-line="12" selection-start-column="17" selection-end-line="12" selection-end-column="17" />
  854 + <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
1025 855 <folding />
1026 856 </state>
1027 857 </provider>
1028 858 </entry>
1029   - <entry file="file://$PROJECT_DIR$/Gemfile">
  859 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
1030 860 <provider selected="true" editor-type-id="text-editor">
1031   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
1032   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  861 + <state vertical-scroll-proportion="0.0" vertical-offset="731" max-vertical-offset="1425">
  862 + <caret line="83" column="35" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" />
1033 863 <folding />
1034 864 </state>
1035 865 </provider>
1036 866 </entry>
1037   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  867 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
1038 868 <provider selected="true" editor-type-id="text-editor">
1039   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
1040   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  869 + <state vertical-scroll-proportion="0.47791797" vertical-offset="2172" max-vertical-offset="4005">
  870 + <caret line="165" column="94" selection-start-line="165" selection-start-column="94" selection-end-line="165" selection-end-column="94" />
1041 871 <folding />
1042 872 </state>
1043 873 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.17)
  4 + kanjai (0.0.18)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -29,20 +29,22 @@ module Kanjai
29 29 def get_page
30 30 @url = get_page_url
31 31
32   - @page_data = PageDatum.where(:url => @url).first
33   - $current_locale = PageLang.where(default_use: true).first.code
  32 + #@page_data = PageDatum.where(:url => @url).first
  33 + #$current_locale = PageLang.where(default_use: true).first.code
  34 + @page_data = PageDatum.where(:url => @url, lang: I18n.locale).first
  35 + $current_locale = I18n.locale
34 36 if @page_data
35   - $current_locale = @page_data.lang
  37 + #$current_locale = @page_data.lang
36 38 else
37 39 if @url == '/'
38 40 root_page = Page.where(root_page: true).first
39 41 if root_page
40   - page_data = root_page.page_data.where(lang: $current_locale).first
  42 + page_data = root_page.page_data.where(lang: I18n.locale).first
41 43 redirect_to page_data.url.to_s
42 44 end
43 45 end
44 46 end
45   - I18n.locale = $current_locale
  47 + #I18n.locale = $current_locale
46 48 $url = @url
47 49 end
48 50
... ...
... ... @@ -162,8 +162,8 @@ module Kanjai
162 162 content = item_state_template.gsub('###LANG_CODE###', lang.code)
163 163 .gsub('###LANG_TITLE###', lang.title)
164 164
165   - if page and item_page_data = page.page_data.where(lang: lang.code).first
166   - content = content.gsub('###PAGE_LINK###', item_page_data.url.to_s)
  165 + if page
  166 + content = content.gsub('###PAGE_LINK###', page.menu_url($scheme, lang.code))
167 167 else
168 168 content = content.gsub('###PAGE_LINK###', '/')
169 169 end
... ...