EDIT / kanjai · Commits

Commit 5582cf37fafdd54a314eaed43c78fb69d716ea81

Authored by Karpikau Andrei
1 parent 59887fca

check some point

Inline Side-by-side
Showing 13 changed files with 345 additions and 237 deletions
... ... @@ -27,99 +27,107 @@
27 27 <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
28 28 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
29 29 <provider selected="true" editor-type-id="text-editor">
30   - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="390">
31   - <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
  30 + <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 32 <folding />
33 33 </state>
34 34 </provider>
35 35 </entry>
36 36 </file>
37   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
38   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  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">
39 39 <provider selected="true" editor-type-id="text-editor">
40   - <state vertical-scroll-proportion="0.0" vertical-offset="1826" max-vertical-offset="2490">
41   - <caret line="146" column="0" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
  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" />
42 42 <folding />
43 43 </state>
44 44 </provider>
45 45 </entry>
46 46 </file>
47   - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
48   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  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">
49 49 <provider selected="true" editor-type-id="text-editor">
50   - <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="885">
51   - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
52   - <folding />
  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>
53 59 </state>
54 60 </provider>
55 61 </entry>
56 62 </file>
57   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
58   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  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">
59 65 <provider selected="true" editor-type-id="text-editor">
60   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4230">
  66 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
61 67 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
62 68 <folding />
63 69 </state>
64 70 </provider>
65 71 </entry>
66 72 </file>
67   - <file leaf-file-name="admin_controller.rb" pinned="false" current-in-tab="false">
68   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  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">
69 75 <provider selected="true" editor-type-id="text-editor">
70   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
71   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  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" />
72 78 <folding />
73 79 </state>
74 80 </provider>
75 81 </entry>
76 82 </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">
  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">
79 85 <provider selected="true" editor-type-id="text-editor">
80   - <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="330">
81   - <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
  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" />
82 88 <folding />
83 89 </state>
84 90 </provider>
85 91 </entry>
86 92 </file>
87   - <file leaf-file-name="template_parser.rb" pinned="false" current-in-tab="false">
88   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
  93 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  94 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
89 95 <provider selected="true" editor-type-id="text-editor">
90   - <state vertical-scroll-proportion="0.0" vertical-offset="375" max-vertical-offset="2250">
91   - <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
  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" />
92 98 <folding />
93 99 </state>
94 100 </provider>
95 101 </entry>
96 102 </file>
97   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
98   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  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">
99 105 <provider selected="true" editor-type-id="text-editor">
100   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
101   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  106 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="120">
  107 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
102 108 <folding />
103 109 </state>
104 110 </provider>
105 111 </entry>
106 112 </file>
107   - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
108   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  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">
109 115 <provider selected="true" editor-type-id="text-editor">
110   - <state vertical-scroll-proportion="0.0" vertical-offset="3521" max-vertical-offset="4155">
111   - <caret line="199" column="54" selection-start-line="199" selection-start-column="54" selection-end-line="199" selection-end-column="54" />
  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" />
112 118 <folding />
113 119 </state>
114 120 </provider>
115 121 </entry>
116 122 </file>
117   - <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="false">
118   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  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">
119 125 <provider selected="true" editor-type-id="text-editor">
120   - <state vertical-scroll-proportion="0.0" vertical-offset="735" max-vertical-offset="1995">
121   - <caret line="53" column="62" selection-start-line="53" selection-start-column="62" selection-end-line="53" selection-end-column="62" />
122   - <folding />
  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>
123 131 </state>
124 132 </provider>
125 133 </entry>
... ... @@ -129,9 +137,6 @@
129 137 <component name="IdeDocumentHistory">
130 138 <option name="CHANGED_PATHS">
131 139 <list>
132   - <option value="$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb" />
133   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/new.html.erb" />
134   - <option value="$PROJECT_DIR$/app/views/kanjai/shared/_edit_resource_links.html.erb" />
135 140 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb" />
136 141 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb" />
137 142 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb" />
... ... @@ -163,22 +168,25 @@
163 168 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
164 169 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
165 170 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
166   - <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
167 171 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
168 172 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
169 173 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
170 174 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" />
171   - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
172 175 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />
173 176 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
174   - <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
175   - <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
176 177 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
177 178 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
178 179 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
179 180 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
180   - <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
181 181 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  182 + <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  183 + <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
  184 + <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
  185 + <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
  186 + <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
  187 + <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
  188 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
  189 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
182 190 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 191 </list>
184 192 </option>
... ... @@ -214,6 +222,8 @@
214 222 <sortByType />
215 223 </navigator>
216 224 <panes>
  225 + <pane id="Scope" />
  226 + <pane id="RailsProjectView" />
217 227 <pane id="ProjectPane">
218 228 <subPane>
219 229 <PATH>
... ... @@ -292,7 +302,7 @@
292 302 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
293 303 </PATH_ELEMENT>
294 304 <PATH_ELEMENT>
295   - <option name="myItemId" value="config" />
  305 + <option name="myItemId" value="app" />
296 306 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
297 307 </PATH_ELEMENT>
298 308 </PATH>
... ... @@ -309,6 +319,14 @@
309 319 <option name="myItemId" value="app" />
310 320 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
311 321 </PATH_ELEMENT>
  322 + <PATH_ELEMENT>
  323 + <option name="myItemId" value="helpers" />
  324 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  325 + </PATH_ELEMENT>
  326 + <PATH_ELEMENT>
  327 + <option name="myItemId" value="kanjai" />
  328 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  329 + </PATH_ELEMENT>
312 330 </PATH>
313 331 <PATH>
314 332 <PATH_ELEMENT>
... ... @@ -324,11 +342,33 @@
324 342 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
325 343 </PATH_ELEMENT>
326 344 <PATH_ELEMENT>
327   - <option name="myItemId" value="controllers" />
  345 + <option name="myItemId" value="helpers" />
  346 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  347 + </PATH_ELEMENT>
  348 + <PATH_ELEMENT>
  349 + <option name="myItemId" value="kanjai" />
  350 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  351 + </PATH_ELEMENT>
  352 + <PATH_ELEMENT>
  353 + <option name="myItemId" value="admin" />
328 354 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
329 355 </PATH_ELEMENT>
  356 + </PATH>
  357 + <PATH>
330 358 <PATH_ELEMENT>
331 359 <option name="myItemId" value="kanjai" />
  360 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  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_ELEMENT>
  367 + <option name="myItemId" value="app" />
  368 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  369 + </PATH_ELEMENT>
  370 + <PATH_ELEMENT>
  371 + <option name="myItemId" value="assets" />
332 372 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
333 373 </PATH_ELEMENT>
334 374 </PATH>
... ... @@ -349,11 +389,17 @@
349 389 <option name="myItemId" value="assets" />
350 390 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
351 391 </PATH_ELEMENT>
  392 + <PATH_ELEMENT>
  393 + <option name="myItemId" value="javascripts" />
  394 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  395 + </PATH_ELEMENT>
  396 + <PATH_ELEMENT>
  397 + <option name="myItemId" value="kanjai" />
  398 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  399 + </PATH_ELEMENT>
352 400 </PATH>
353 401 </subPane>
354 402 </pane>
355   - <pane id="RailsProjectView" />
356   - <pane id="Scope" />
357 403 </panes>
358 404 </component>
359 405 <component name="PropertiesComponent">
... ... @@ -537,24 +583,24 @@
537 583 <layout>
538 584 <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" />
539 585 <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" />
540   - <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" />
541 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" />
542   - <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" />
543   - <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" />
544   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2819063" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
545   - <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" />
  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" />
546 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" />
547 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 + <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" />
  593 + <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 + <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" />
548 597 <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" />
549 598 <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" />
550 599 <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" />
551   - <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" />
552   - <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" />
553 600 <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" />
554 601 <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" />
555 602 <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" />
556 603 <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" />
557   - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
558 604 </layout>
559 605 </component>
560 606 <component name="Vcs.Log.UiProperties">
... ... @@ -578,366 +624,396 @@
578 624 <watches-manager />
579 625 </component>
580 626 <component name="editorHistoryManager">
581   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb">
  627 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
582 628 <provider selected="true" editor-type-id="text-editor">
583   - <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="255">
584   - <caret line="3" column="77" selection-start-line="3" selection-start-column="77" selection-end-line="3" selection-end-column="77" />
  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" />
585 631 </state>
586 632 </provider>
587 633 </entry>
588   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
  634 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
589 635 <provider selected="true" editor-type-id="text-editor">
590   - <state vertical-scroll-proportion="-8.833333" vertical-offset="268" max-vertical-offset="660">
591   - <caret line="32" column="11" selection-start-line="32" selection-start-column="11" selection-end-line="32" selection-end-column="11" />
  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" />
592 638 </state>
593 639 </provider>
594 640 </entry>
595   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/create/_success.js.erb">
  641 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
596 642 <provider selected="true" editor-type-id="text-editor">
597   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="392">
598   - <caret line="0" column="73" selection-start-line="0" selection-start-column="73" selection-end-line="0" selection-end-column="73" />
  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" />
599 645 </state>
600 646 </provider>
601 647 </entry>
602   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
  648 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
603 649 <provider selected="true" editor-type-id="text-editor">
604   - <state vertical-scroll-proportion="0.0" vertical-offset="660" max-vertical-offset="1650">
605   - <caret line="48" column="47" selection-start-line="48" selection-start-column="47" selection-end-line="48" selection-end-column="47" />
  650 + <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">
  651 + <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" />
606 652 </state>
607 653 </provider>
608 654 </entry>
609   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb">
  655 + <entry file="file://$PROJECT_DIR$/.ruby-version">
610 656 <provider selected="true" editor-type-id="text-editor">
611   - <state vertical-scroll-proportion="-3.3333333" vertical-offset="205" max-vertical-offset="570">
612   - <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
  657 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
  658 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
613 659 </state>
614 660 </provider>
615 661 </entry>
616   - <entry file="file://$PROJECT_DIR$/lib/stdrubyext.rb">
  662 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
617 663 <provider selected="true" editor-type-id="text-editor">
618   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">
619   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  664 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  665 + <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
620 666 </state>
621 667 </provider>
622 668 </entry>
623   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/bootstrap.js">
  669 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
624 670 <provider selected="true" editor-type-id="text-editor">
625   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="34905">
626   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  671 + <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390">
  672 + <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />
627 673 </state>
628 674 </provider>
629 675 </entry>
630   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend/html_editor.css.scss">
  676 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
631 677 <provider selected="true" editor-type-id="text-editor">
632   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
633   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  678 + <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
  679 + <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
  680 + </state>
  681 + </provider>
  682 + </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" />
634 687 </state>
635 688 </provider>
636 689 </entry>
637   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss">
  690 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
638 691 <provider selected="true" editor-type-id="text-editor">
639   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="105">
640   - <caret line="0" column="28" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="28" />
  692 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  693 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
641 694 </state>
642 695 </provider>
643 696 </entry>
644   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
  697 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
645 698 <provider selected="true" editor-type-id="text-editor">
646   - <state vertical-scroll-proportion="0.04918033" vertical-offset="0" max-vertical-offset="610">
647   - <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="48" />
  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" />
648 701 </state>
649 702 </provider>
650 703 </entry>
651   - <entry file="file://$PROJECT_DIR$/../cms_test/bin/delayed_job">
  704 + <entry file="file://$PROJECT_DIR$/README.rdoc">
652 705 <provider selected="true" editor-type-id="text-editor">
653 706 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
654 707 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
655 708 </state>
656 709 </provider>
657 710 </entry>
658   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb">
  711 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
659 712 <provider selected="true" editor-type-id="text-editor">
660   - <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="420">
661   - <caret line="10" column="41" selection-start-line="10" selection-start-column="41" selection-end-line="10" selection-end-column="41" />
  713 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  714 + <caret line="0" column="24" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
662 715 </state>
663 716 </provider>
664 717 </entry>
665   - <entry file="file://$PROJECT_DIR$/Gemfile.lock">
  718 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
666 719 <provider selected="true" editor-type-id="text-editor">
667   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3615">
668   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  720 + <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
  721 + <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
669 722 </state>
670 723 </provider>
671 724 </entry>
672   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
  725 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
673 726 <provider selected="true" editor-type-id="text-editor">
674   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">
  727 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
675 728 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
676 729 </state>
677 730 </provider>
678 731 </entry>
679   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  732 + <entry file="file://$PROJECT_DIR$/Gemfile">
680 733 <provider selected="true" editor-type-id="text-editor">
681   - <state vertical-scroll-proportion="-4.7777777" vertical-offset="4281" max-vertical-offset="7155">
682   - <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="36" />
  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" />
683 736 </state>
684 737 </provider>
685 738 </entry>
686   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
  739 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
687 740 <provider selected="true" editor-type-id="text-editor">
688   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
689   - <caret line="2" column="0" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="24" />
  741 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
  742 + <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
690 743 </state>
691 744 </provider>
692 745 </entry>
693   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
  746 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
694 747 <provider selected="true" editor-type-id="text-editor">
695   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
696   - <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="28" />
  748 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4230">
  749 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
697 750 </state>
698 751 </provider>
699 752 </entry>
700   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  753 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
701 754 <provider selected="true" editor-type-id="text-editor">
702   - <state vertical-scroll-proportion="-12.0" vertical-offset="3246" max-vertical-offset="8085">
703   - <caret line="238" column="19" selection-start-line="236" selection-start-column="0" selection-end-line="238" selection-end-column="19" />
  755 + <state vertical-scroll-proportion="4.9399037" vertical-offset="0" max-vertical-offset="2445">
  756 + <caret line="137" column="86" selection-start-line="130" selection-start-column="0" selection-end-line="137" selection-end-column="86" />
704 757 </state>
705 758 </provider>
706 759 </entry>
707   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
  760 + <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
708 761 <provider selected="true" editor-type-id="text-editor">
709   - <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">
710   - <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" />
  762 + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="2520">
  763 + <caret line="29" column="15" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" />
  764 + <folding />
711 765 </state>
712 766 </provider>
713 767 </entry>
714   - <entry file="file://$PROJECT_DIR$/.ruby-version">
  768 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
715 769 <provider selected="true" editor-type-id="text-editor">
716   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
717   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  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 />
718 773 </state>
719 774 </provider>
720 775 </entry>
721   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
  776 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
722 777 <provider selected="true" editor-type-id="text-editor">
723   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
724   - <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
  778 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  779 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  780 + <folding />
725 781 </state>
726 782 </provider>
727 783 </entry>
728   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
  784 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
729 785 <provider selected="true" editor-type-id="text-editor">
730   - <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390">
731   - <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />
  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 />
732 789 </state>
733 790 </provider>
734 791 </entry>
735   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  792 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
736 793 <provider selected="true" editor-type-id="text-editor">
737   - <state vertical-scroll-proportion="0.0" vertical-offset="95" max-vertical-offset="810">
738   - <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" />
  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 />
739 797 </state>
740 798 </provider>
741 799 </entry>
742   - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  800 + <entry file="file://$PROJECT_DIR$/app/views/shared/_extend_admin_menu.html.erb">
743 801 <provider selected="true" editor-type-id="text-editor">
744   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
  802 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
745 803 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  804 + <folding />
746 805 </state>
747 806 </provider>
748 807 </entry>
749   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  808 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/config_controller.rb">
750 809 <provider selected="true" editor-type-id="text-editor">
751   - <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
752   - <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
  810 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  811 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  812 + <folding />
753 813 </state>
754 814 </provider>
755 815 </entry>
756   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  816 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
757 817 <provider selected="true" editor-type-id="text-editor">
758   - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
759   - <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
  818 + <state vertical-scroll-proportion="-17.5" vertical-offset="0" max-vertical-offset="825">
  819 + <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>
760 826 </state>
761 827 </provider>
762 828 </entry>
763   - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
  829 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
764 830 <provider selected="true" editor-type-id="text-editor">
765   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
766   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  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 />
767 834 </state>
768 835 </provider>
769 836 </entry>
770   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  837 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_langs_controller.rb">
771 838 <provider selected="true" editor-type-id="text-editor">
772   - <state vertical-scroll-proportion="0.0" vertical-offset="1811" max-vertical-offset="2445">
773   - <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
  839 + <state vertical-scroll-proportion="0.0" vertical-offset="435" max-vertical-offset="975">
  840 + <caret line="46" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
  841 + <folding />
774 842 </state>
775 843 </provider>
776 844 </entry>
777   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  845 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/_error_messages.html.erb">
778 846 <provider selected="true" editor-type-id="text-editor">
779   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
780   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  847 + <state vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="225">
  848 + <caret line="4" column="38" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="38" />
  849 + <folding />
781 850 </state>
782 851 </provider>
783 852 </entry>
784   - <entry file="file://$PROJECT_DIR$/README.rdoc">
  853 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
785 854 <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="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  855 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1995">
  856 + <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />
  857 + <folding />
788 858 </state>
789 859 </provider>
790 860 </entry>
791   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
  861 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
792 862 <provider selected="true" editor-type-id="text-editor">
793   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
794   - <caret line="0" column="24" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
  863 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  864 + <caret line="1" column="29" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="29" />
  865 + <folding />
795 866 </state>
796 867 </provider>
797 868 </entry>
798   - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
  869 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/_new_form.html.erb">
799 870 <provider selected="true" editor-type-id="text-editor">
800   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  871 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
801 872 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  873 + <folding />
802 874 </state>
803 875 </provider>
804 876 </entry>
805   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
  877 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb">
806 878 <provider selected="true" editor-type-id="text-editor">
807   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
808   - <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
  879 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  880 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  881 + <folding />
809 882 </state>
810 883 </provider>
811 884 </entry>
812   - <entry file="file://$PROJECT_DIR$/config/routes.rb">
  885 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
813 886 <provider selected="true" editor-type-id="text-editor">
814   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
815   - <caret line="9" column="72" selection-start-line="9" selection-start-column="2" selection-end-line="9" selection-end-column="72" />
  887 + <state vertical-scroll-proportion="-9.703704" vertical-offset="1043" max-vertical-offset="1650">
  888 + <caret line="87" column="68" selection-start-line="87" selection-start-column="48" selection-end-line="87" selection-end-column="68" />
816 889 <folding />
817 890 </state>
818 891 </provider>
819 892 </entry>
820   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  893 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
821 894 <provider selected="true" editor-type-id="text-editor">
822   - <state vertical-scroll-proportion="0.0" vertical-offset="731" max-vertical-offset="1425">
823   - <caret line="83" column="35" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" />
  895 + <state vertical-scroll-proportion="-11.37037" vertical-offset="2093" max-vertical-offset="2745">
  896 + <caret line="160" column="0" selection-start-line="158" selection-start-column="0" selection-end-line="160" selection-end-column="0" />
824 897 <folding />
825 898 </state>
826 899 </provider>
827 900 </entry>
828   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
  901 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
829 902 <provider selected="true" editor-type-id="text-editor">
830   - <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
831   - <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
  903 + <state vertical-scroll-proportion="-3.75" vertical-offset="30" max-vertical-offset="660">
  904 + <caret line="8" column="152" selection-start-line="8" selection-start-column="117" selection-end-line="8" selection-end-column="152" />
  905 + <folding />
832 906 </state>
833 907 </provider>
834 908 </entry>
835   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
  909 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb">
836 910 <provider selected="true" editor-type-id="text-editor">
837   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  911 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
838 912 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  913 + <folding />
839 914 </state>
840 915 </provider>
841 916 </entry>
842   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
843   - <provider selected="true" editor-type-id="text-editor">
844   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
845   - <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
846   - </state>
847   - </provider>
848   - </entry>
849   - <entry file="file://$PROJECT_DIR$/Gemfile">
  917 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
850 918 <provider selected="true" editor-type-id="text-editor">
851   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
852   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  919 + <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="900">
  920 + <caret line="51" column="44" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="44" />
853 921 <folding />
854 922 </state>
855 923 </provider>
856 924 </entry>
857   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  925 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
858 926 <provider selected="true" editor-type-id="text-editor">
859   - <state vertical-scroll-proportion="0.0" vertical-offset="390" max-vertical-offset="2745">
860   - <caret line="54" column="61" selection-start-line="54" selection-start-column="34" selection-end-line="54" selection-end-column="61" />
  927 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="435">
  928 + <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
861 929 <folding />
862 930 </state>
863 931 </provider>
864 932 </entry>
865   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
  933 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/dashboard_controller.rb">
866 934 <provider selected="true" editor-type-id="text-editor">
867   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
868   - <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
  935 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="225">
  936 + <caret line="2" column="29" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="29" />
869 937 <folding />
870 938 </state>
871 939 </provider>
872 940 </entry>
873   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  941 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
874 942 <provider selected="true" editor-type-id="text-editor">
875   - <state vertical-scroll-proportion="0.0" vertical-offset="2655" max-vertical-offset="4155">
876   - <caret line="199" column="54" selection-start-line="199" selection-start-column="54" selection-end-line="199" selection-end-column="54" />
  943 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
  944 + <caret line="1" column="23" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="23" />
877 945 <folding />
878 946 </state>
879 947 </provider>
880 948 </entry>
881   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  949 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
882 950 <provider selected="true" editor-type-id="text-editor">
883   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
884   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
885   - <folding />
  951 + <state vertical-scroll-proportion="0.0" vertical-offset="6521" max-vertical-offset="7155">
  952 + <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>
886 960 </state>
887 961 </provider>
888 962 </entry>
889   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  963 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
890 964 <provider selected="true" editor-type-id="text-editor">
891   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
892   - <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
893   - <folding />
  965 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
  966 + <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>
894 970 </state>
895 971 </provider>
896 972 </entry>
897   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  973 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
898 974 <provider selected="true" editor-type-id="text-editor">
899   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
900   - <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
  975 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  976 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
901 977 <folding />
902 978 </state>
903 979 </provider>
904 980 </entry>
905   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  981 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
906 982 <provider selected="true" editor-type-id="text-editor">
907   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4230">
908   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  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" />
909 985 <folding />
910 986 </state>
911 987 </provider>
912 988 </entry>
913   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  989 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
914 990 <provider selected="true" editor-type-id="text-editor">
915   - <state vertical-scroll-proportion="0.0" vertical-offset="735" max-vertical-offset="1995">
916   - <caret line="53" column="62" selection-start-line="53" selection-start-column="62" selection-end-line="53" selection-end-column="62" />
  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" />
917 993 <folding />
918 994 </state>
919 995 </provider>
920 996 </entry>
921   - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  997 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/404.html.erb">
922 998 <provider selected="true" editor-type-id="text-editor">
923   - <state vertical-scroll-proportion="0.23659305" vertical-offset="0" max-vertical-offset="634">
924   - <caret line="10" column="275" selection-start-line="10" selection-start-column="275" selection-end-line="10" selection-end-column="275" />
  999 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1000 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
925 1001 <folding />
926 1002 </state>
927 1003 </provider>
928 1004 </entry>
929   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1005 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
930 1006 <provider selected="true" editor-type-id="text-editor">
931   - <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="885">
932   - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
  1007 + <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" />
933 1009 <folding />
934 1010 </state>
935 1011 </provider>
936 1012 </entry>
937   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1013 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
938 1014 <provider selected="true" editor-type-id="text-editor">
939   - <state vertical-scroll-proportion="0.0" vertical-offset="1826" max-vertical-offset="2490">
940   - <caret line="146" column="0" selection-start-line="146" selection-start-column="0" selection-end-line="146" selection-end-column="0" />
  1015 + <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" />
941 1017 <folding />
942 1018 </state>
943 1019 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.33)
  4 + kanjai (0.0.35)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -33,4 +33,5 @@
33 33 //= require kanjai/froala_editor/plugins/video.min
34 34
35 35 //= require kanjai/admin/admin
  36 +//= require kanjai/admin/admin_extend
36 37 //= require kanjai/admin/html_generator
\ No newline at end of file
... ...
1 1 module Kanjai
2 2 class AdminController < ApplicationController
  3 + unloadable
  4 +
3 5 layout 'kanjai/admin'
4 6
5 7 protect_from_forgery
... ... @@ -8,7 +10,6 @@ module Kanjai
8 10
9 11 before_filter :set_locale
10 12
11   -
12 13 private
13 14
14 15 def set_locale
... ...
... ... @@ -37,7 +37,7 @@ module Kanjai
37 37
38 38
39 39 else
40   - render :template => 'kanjai/shared/404', status: 404, layout: false and returm
  40 + render :template => 'kanjai/shared/404', status: 404, layout: false and return
41 41 end
42 42 end
43 43
... ... @@ -72,19 +72,19 @@ module Kanjai
72 72
73 73 end
74 74
75   - layer.scan(/(<element name="([\w\W]+?)"><\/element>)/).each do |item|
76   - content = item[0]
77   - name = item[1]
78   - code = name.parameterize
  75 + (0..1).each do |index|
  76 + layer.scan(/(<element name="([\w\W]+?)"><\/element>)/).each do |item|
  77 + content = item[0]
  78 + name = item[1]
  79 + code = name.parameterize
79 80
80   - template_part = page_template.template_parts.find_by_code(code)
  81 + template_part = page_template.template_parts.find_by_code(code)
81 82
82   - if template_part
83   - html = TemplateGenerator::subpart_generate(page_template, template_part.part_type, template_part.elements)
84   - layer.gsub!(content, html)
  83 + if template_part
  84 + html = TemplateGenerator::subpart_generate(page_template, template_part.part_type, template_part.elements)
  85 + layer.gsub!(content, html)
  86 + end
85 87 end
86   -
87   -
88 88 end
89 89
90 90 #try find in static elements
... ...
1 1 module Kanjai
2 2 class SiteController < ApplicationController
3   - layout 'site'
  3 + layout false
4 4
5 5 protect_from_forgery
6 6
... ... @@ -33,18 +33,25 @@ module Kanjai
33 33 #$current_locale = PageLang.where(default_use: true).first.code
34 34 @page_data = PageDatum.where(:url => @url, lang: I18n.locale).first
35 35 $current_locale = I18n.locale
  36 + if @page_data.nil?
  37 + mas = @url.split('/')
  38 + if mas.length > 1
  39 + @url = '/' + mas[1] + '/:path'
  40 + @page_data = PageDatum.where(:url => @url, lang: I18n.locale).first
  41 + end
  42 + end
  43 +
  44 +
36 45 if @page_data
37 46 #$current_locale = @page_data.lang
38 47 else
39 48 if @url == '/'
40 49 root_page = Page.where(root_page: true).first
41 50 if root_page
42   - page_data = root_page.page_data.where(lang: I18n.locale).first
43 51 redirect_to root_page.menu_url($scheme)
44 52 end
45 53 end
46 54 end
47   - #I18n.locale = $current_locale
48 55 $url = @url
49 56 end
50 57
... ...
... ... @@ -44,7 +44,6 @@ module Kanjai
44 44 def generate_url(scheme, url, lang)
45 45 lang = I18n.locale.to_s if lang.nil?
46 46
47   -
48 47 if /(http|https):\/\//.match url
49 48 url
50 49 else
... ...
... ... @@ -21,11 +21,12 @@
21 21 <nav class="navbar navbar-default">
22 22 <div class="container-fluid">
23 23 <div class="navbar-header">
24   - <%= link_to t('configuration_menu_title'), admin_configuration_url, :class => 'navbar-brand' %>
25   - <%= link_to t('pages_menu_title'), admin_pages_url, :class => 'navbar-brand' %>
26   - <%= link_to t('page_langs_menu_title'), admin_page_langs_url, :class => 'navbar-brand' %>
27   - <%= link_to t('templates_menu_title'), admin_page_templates_url, :class => 'navbar-brand' %>
28   - <%= link_to 'Exit', destroy_admin_user_session_path, :method => :delete, :class => 'navbar-brand' %>
  24 + <%= render :partial => 'shared/extend_admin_menu' %>
  25 + <%= link_to t('configuration_menu_title'), kanjai.admin_configuration_url, :class => 'navbar-brand' %>
  26 + <%= link_to t('pages_menu_title'), kanjai.admin_pages_url, :class => 'navbar-brand' %>
  27 + <%= link_to t('page_langs_menu_title'), kanjai.admin_page_langs_url, :class => 'navbar-brand' %>
  28 + <%= link_to t('templates_menu_title'), kanjai.admin_page_templates_url, :class => 'navbar-brand' %>
  29 + <%= link_to 'Exit', kanjai.destroy_admin_user_session_path, :method => :delete, :class => 'navbar-brand' %>
29 30
30 31 </div>
31 32 </div>
... ...
... ... @@ -7,9 +7,17 @@ module Kanjai
7 7 config.autoload_paths += %W(#{config.root}/lib)
8 8 config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
9 9
  10 + config.to_prepare do
  11 + Dir.glob(Rails.root + "app/decorators/**/*_decorator*.rb").each do |c|
  12 + require_dependency(c)
  13 + end
  14 + end
  15 +
10 16 initializer "kanjai.assets.precompile" do |app|
11 17 app.config.assets.precompile = %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js kanjai/frontend_not_login.js)
12 18 end
13 19
  20 +
  21 +
14 22 end
15 23 end
... ...
... ... @@ -90,7 +90,7 @@ module Kanjai
90 90 begin
91 91 if !!UserSession
92 92 if UserSession.current_user
93   - page_collection = page_collection.where(private_flag: true)
  93 + page_collection = page_collection.where(private_flag => [true, false])
94 94 else
95 95 page_collection = page_collection.where(private_flag: false)
96 96 end
... ... @@ -107,9 +107,16 @@ module Kanjai
107 107 self.menu_generator(next_level[:children], subparts, nil, page)
108 108 else
109 109
110   - if normal_state_template.present?
111   - subparts << normal_state_template.gsub('###link###', page.menu_url('http://', lang = nil))
112   - .gsub('###title###', page.lang_attributes(PageLang.default, :title))
  110 + if $url == page.lang_attributes(I18n.locale, :url)
  111 + if active_state_template.present?
  112 + subparts << active_state_template.gsub('###link###', page.menu_url($scheme, lang = nil))
  113 + .gsub('###title###', page.lang_attributes(PageLang.default, :title))
  114 + end
  115 + else
  116 + if normal_state_template.present?
  117 + subparts << normal_state_template.gsub('###link###', page.menu_url($scheme, lang = nil))
  118 + .gsub('###title###', page.lang_attributes(PageLang.default, :title))
  119 + end
113 120 end
114 121
115 122 if separator_template.present? and page != page_collection.last
... ... @@ -225,9 +232,17 @@ module Kanjai
225 232 controller_name = controller_name_item[:source]
226 233 action_name = action_name_item[:source]
227 234
228   - str = controller_name.constantize.render action_name.to_sym, locals: {}
  235 + controller = controller_name.constantize.new
  236 + controller.send action_name
  237 + controller_variables = controller.instance_variables
  238 + hash = {}
  239 + controller_variables.each do |variable|
  240 + hash[variable.to_s[1..-1]] = controller.instance_variable_get(variable.to_s)
  241 + end
  242 + str = controller_name.constantize.render action_name.to_sym, assigns: hash
229 243
230 244 end
  245 +
231 246 end
232 247
233 248
... ...
1 1 module Kanjai
2   - VERSION = "0.0.35"
  2 + VERSION = "0.0.36"
3 3 end
... ...