EDIT / kanjai · Commits

Commit 8be3ca23ea80907bc00d6989c278a36a9ea58286

Authored by Karpikau Andrei
1 parent 96e55d66

update

Inline Side-by-side
Showing 5 changed files with 63 additions and 74 deletions
@@ -136,9 +136,9 @@ @@ -136,9 +136,9 @@
136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.4, rbenv: 2.1.3) [gem]" level="application" /> 136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.4, rbenv: 2.1.3) [gem]" level="application" />
137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" /> 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" /> 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.2.37, rbenv: 2.1.3) [gem]" level="application" />  
140 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.2.37, rbenv: 2.1.3) [gem]" level="application" />  
141 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.2.37, rbenv: 2.1.3) [gem]" level="application" /> 139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.3.0, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.0, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.0, rbenv: 2.1.3) [gem]" level="application" />
142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> 143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" /> 144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
@@ -37,27 +37,17 @@ @@ -37,27 +37,17 @@
37 <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false"> 37 <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
38 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb"> 38 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 - <state vertical-scroll-proportion="-9.148149" vertical-offset="2858" max-vertical-offset="4110"> 40 + <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
41 <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" /> 41 <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
42 <folding /> 42 <folding />
43 </state> 43 </state>
44 </provider> 44 </provider>
45 </entry> 45 </entry>
46 </file> 46 </file>
47 - <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">  
48 - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">  
49 - <provider selected="true" editor-type-id="text-editor">  
50 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">  
51 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
52 - <folding />  
53 - </state>  
54 - </provider>  
55 - </entry>  
56 - </file>  
57 <file leaf-file-name="install.rake" pinned="false" current-in-tab="false"> 47 <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
58 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 48 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
59 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
60 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 50 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="390">
61 <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" /> 51 <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
62 <folding /> 52 <folding />
63 </state> 53 </state>
@@ -77,7 +67,7 @@ @@ -77,7 +67,7 @@
77 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 67 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
78 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 68 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
79 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
80 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2115"> 70 + <state vertical-scroll-proportion="0.0" vertical-offset="1710" max-vertical-offset="2115">
81 <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" /> 71 <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" />
82 <folding /> 72 <folding />
83 </state> 73 </state>
@@ -97,8 +87,18 @@ @@ -97,8 +87,18 @@
97 <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false"> 87 <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">
98 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb"> 88 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
99 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
100 - <state vertical-scroll-proportion="0.0" vertical-offset="1706" max-vertical-offset="2340">  
101 - <caret line="133" column="23" selection-start-line="133" selection-start-column="23" selection-end-line="133" selection-end-column="23" /> 90 + <state vertical-scroll-proportion="0.0" vertical-offset="1811" max-vertical-offset="2445">
  91 + <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
  92 + <folding />
  93 + </state>
  94 + </provider>
  95 + </entry>
  96 + </file>
  97 + <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
  98 + <entry file="file://$PROJECT_DIR$/Gemfile">
  99 + <provider selected="true" editor-type-id="text-editor">
  100 + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="255">
  101 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
102 <folding /> 102 <folding />
103 </state> 103 </state>
104 </provider> 104 </provider>
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 108 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
109 <provider selected="true" editor-type-id="text-editor"> 109 <provider selected="true" editor-type-id="text-editor">
110 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255"> 110 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
111 - <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" /> 111 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
112 <folding /> 112 <folding />
113 </state> 113 </state>
114 </provider> 114 </provider>
@@ -150,7 +150,6 @@ @@ -150,7 +150,6 @@
150 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb" /> 150 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb" />
151 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/underscore.js" /> 151 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/underscore.js" />
152 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" /> 152 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
153 - <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />  
154 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" /> 153 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />
155 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb" /> 154 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb" />
156 <option value="$PROJECT_DIR$/Gemfile" /> 155 <option value="$PROJECT_DIR$/Gemfile" />
@@ -179,6 +178,7 @@ @@ -179,6 +178,7 @@
179 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 178 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
180 <option value="$PROJECT_DIR$/config/initializers/devise.rb" /> 179 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
181 <option value="$PROJECT_DIR$/lib/kanjai.rb" /> 180 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
  181 + <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 </list> 183 </list>
184 </option> 184 </option>
@@ -215,7 +215,6 @@ @@ -215,7 +215,6 @@
215 </navigator> 215 </navigator>
216 <panes> 216 <panes>
217 <pane id="RailsProjectView" /> 217 <pane id="RailsProjectView" />
218 - <pane id="Scope" />  
219 <pane id="ProjectPane"> 218 <pane id="ProjectPane">
220 <subPane> 219 <subPane>
221 <PATH> 220 <PATH>
@@ -412,6 +411,7 @@ @@ -412,6 +411,7 @@
412 </PATH> 411 </PATH>
413 </subPane> 412 </subPane>
414 </pane> 413 </pane>
  414 + <pane id="Scope" />
415 </panes> 415 </panes>
416 </component> 416 </component>
417 <component name="PropertiesComponent"> 417 <component name="PropertiesComponent">
@@ -593,26 +593,26 @@ @@ -593,26 +593,26 @@
593 <frame x="0" y="23" width="1280" height="728" extended-state="6" /> 593 <frame x="0" y="23" width="1280" height="728" extended-state="6" />
594 <editor active="true" /> 594 <editor active="true" />
595 <layout> 595 <layout>
596 - <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" />  
597 <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" /> 596 <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" />
598 <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" /> 597 <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" />
599 <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" /> 598 <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" />
600 <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" /> 599 <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" />
601 <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" /> 600 <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" />
602 <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" /> 601 <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" />
603 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26171243" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 602 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2657512" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
604 <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" /> 603 <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" />
605 <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" /> 604 <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" />
606 <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" /> 605 <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" />
607 <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" /> 606 <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" />
608 <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" /> 607 <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" />
609 - <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" />  
610 <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" /> 608 <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" />
  609 + <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" />
611 <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" /> 610 <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" />
  611 + <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" />
612 <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" /> 612 <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" />
613 - <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" />  
614 - <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" />  
615 <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" /> 613 <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" />
  614 + <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" />
  615 + <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" />
616 </layout> 616 </layout>
617 </component> 617 </component>
618 <component name="Vcs.Log.UiProperties"> 618 <component name="Vcs.Log.UiProperties">
@@ -655,7 +655,6 @@ @@ -655,7 +655,6 @@
655 <provider selected="true" editor-type-id="text-editor"> 655 <provider selected="true" editor-type-id="text-editor">
656 <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615"> 656 <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615">
657 <caret line="6" column="164" selection-start-line="6" selection-start-column="164" selection-end-line="6" selection-end-column="164" /> 657 <caret line="6" column="164" selection-start-line="6" selection-start-column="164" selection-end-line="6" selection-end-column="164" />
658 - <folding />  
659 </state> 658 </state>
660 </provider> 659 </provider>
661 </entry> 660 </entry>
@@ -670,7 +669,6 @@ @@ -670,7 +669,6 @@
670 <provider selected="true" editor-type-id="text-editor"> 669 <provider selected="true" editor-type-id="text-editor">
671 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750"> 670 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">
672 <caret line="7" column="49" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="49" /> 671 <caret line="7" column="49" selection-start-line="7" selection-start-column="36" selection-end-line="7" selection-end-column="49" />
673 - <folding />  
674 </state> 672 </state>
675 </provider> 673 </provider>
676 </entry> 674 </entry>
@@ -777,7 +775,6 @@ @@ -777,7 +775,6 @@
777 <provider selected="true" editor-type-id="text-editor"> 775 <provider selected="true" editor-type-id="text-editor">
778 <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="900"> 776 <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="900">
779 <caret line="20" column="61" selection-start-line="20" selection-start-column="61" selection-end-line="20" selection-end-column="61" /> 777 <caret line="20" column="61" selection-start-line="20" selection-start-column="61" selection-end-line="20" selection-end-column="61" />
780 - <folding />  
781 </state> 778 </state>
782 </provider> 779 </provider>
783 </entry> 780 </entry>
@@ -831,14 +828,6 @@ @@ -831,14 +828,6 @@
831 </state> 828 </state>
832 </provider> 829 </provider>
833 </entry> 830 </entry>
834 - <entry file="file://$PROJECT_DIR$/Gemfile">  
835 - <provider selected="true" editor-type-id="text-editor">  
836 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">  
837 - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />  
838 - <folding />  
839 - </state>  
840 - </provider>  
841 - </entry>  
842 <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 831 <entry file="file://$PROJECT_DIR$/Gemfile.lock">
843 <provider selected="true" editor-type-id="text-editor"> 832 <provider selected="true" editor-type-id="text-editor">
844 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3615"> 833 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3615">
@@ -857,7 +846,6 @@ @@ -857,7 +846,6 @@
857 <provider selected="true" editor-type-id="text-editor"> 846 <provider selected="true" editor-type-id="text-editor">
858 <state vertical-scroll-proportion="-4.7777777" vertical-offset="4281" max-vertical-offset="7155"> 847 <state vertical-scroll-proportion="-4.7777777" vertical-offset="4281" max-vertical-offset="7155">
859 <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="36" /> 848 <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="36" />
860 - <folding />  
861 </state> 849 </state>
862 </provider> 850 </provider>
863 </entry> 851 </entry>
@@ -879,7 +867,6 @@ @@ -879,7 +867,6 @@
879 <provider selected="true" editor-type-id="text-editor"> 867 <provider selected="true" editor-type-id="text-editor">
880 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615"> 868 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
881 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="28" /> 869 <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="28" />
882 - <folding />  
883 </state> 870 </state>
884 </provider> 871 </provider>
885 </entry> 872 </entry>
@@ -887,7 +874,6 @@ @@ -887,7 +874,6 @@
887 <provider selected="true" editor-type-id="text-editor"> 874 <provider selected="true" editor-type-id="text-editor">
888 <state vertical-scroll-proportion="-12.0" vertical-offset="3246" max-vertical-offset="8085"> 875 <state vertical-scroll-proportion="-12.0" vertical-offset="3246" max-vertical-offset="8085">
889 <caret line="238" column="19" selection-start-line="236" selection-start-column="0" selection-end-line="238" selection-end-column="19" /> 876 <caret line="238" column="19" selection-start-line="236" selection-start-column="0" selection-end-line="238" selection-end-column="19" />
890 - <folding />  
891 </state> 877 </state>
892 </provider> 878 </provider>
893 </entry> 879 </entry>
@@ -895,7 +881,6 @@ @@ -895,7 +881,6 @@
895 <provider selected="true" editor-type-id="text-editor"> 881 <provider selected="true" editor-type-id="text-editor">
896 <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490"> 882 <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">
897 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" /> 883 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" />
898 - <folding />  
899 </state> 884 </state>
900 </provider> 885 </provider>
901 </entry> 886 </entry>
@@ -910,7 +895,6 @@ @@ -910,7 +895,6 @@
910 <provider selected="true" editor-type-id="text-editor"> 895 <provider selected="true" editor-type-id="text-editor">
911 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 896 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
912 <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> 897 <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
913 - <folding />  
914 </state> 898 </state>
915 </provider> 899 </provider>
916 </entry> 900 </entry>
@@ -918,9 +902,6 @@ @@ -918,9 +902,6 @@
918 <provider selected="true" editor-type-id="text-editor"> 902 <provider selected="true" editor-type-id="text-editor">
919 <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390"> 903 <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390">
920 <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" /> 904 <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />
921 - <folding>  
922 - <element signature="n#t('login_title')#0;n#!!top" expanded="false" />  
923 - </folding>  
924 </state> 905 </state>
925 </provider> 906 </provider>
926 </entry> 907 </entry>
@@ -928,13 +909,6 @@ @@ -928,13 +909,6 @@
928 <provider selected="true" editor-type-id="text-editor"> 909 <provider selected="true" editor-type-id="text-editor">
929 <state vertical-scroll-proportion="0.0" vertical-offset="95" max-vertical-offset="810"> 910 <state vertical-scroll-proportion="0.0" vertical-offset="95" max-vertical-offset="810">
930 <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" /> 911 <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" />
931 - <folding>  
932 - <element signature="n#t('admin_panel_title')#0;n#!!top" expanded="false" />  
933 - <element signature="e#529#558#0#ruby" expanded="false" />  
934 - <element signature="e#639#660#0#ruby" expanded="false" />  
935 - <element signature="e#733#759#0#ruby" expanded="false" />  
936 - <element signature="e#837#862#0#ruby" expanded="false" />  
937 - </folding>  
938 </state> 912 </state>
939 </provider> 913 </provider>
940 </entry> 914 </entry>
@@ -972,40 +946,40 @@ @@ -972,40 +946,40 @@
972 </entry> 946 </entry>
973 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb"> 947 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
974 <provider selected="true" editor-type-id="text-editor"> 948 <provider selected="true" editor-type-id="text-editor">
975 - <state vertical-scroll-proportion="-9.148149" vertical-offset="2858" max-vertical-offset="4110"> 949 + <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
976 <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" /> 950 <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
977 <folding /> 951 <folding />
978 </state> 952 </state>
979 </provider> 953 </provider>
980 </entry> 954 </entry>
981 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 955 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
982 <provider selected="true" editor-type-id="text-editor"> 956 <provider selected="true" editor-type-id="text-editor">
983 - <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">  
984 - <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" /> 957 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1185">
  958 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
985 <folding /> 959 <folding />
986 </state> 960 </state>
987 </provider> 961 </provider>
988 </entry> 962 </entry>
989 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> 963 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
990 <provider selected="true" editor-type-id="text-editor"> 964 <provider selected="true" editor-type-id="text-editor">
991 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1185">  
992 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 965 + <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
  966 + <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
993 <folding /> 967 <folding />
994 </state> 968 </state>
995 </provider> 969 </provider>
996 </entry> 970 </entry>
997 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb"> 971 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
998 <provider selected="true" editor-type-id="text-editor"> 972 <provider selected="true" editor-type-id="text-editor">
999 - <state vertical-scroll-proportion="0.0" vertical-offset="1706" max-vertical-offset="2340">  
1000 - <caret line="133" column="23" selection-start-line="133" selection-start-column="23" selection-end-line="133" selection-end-column="23" /> 973 + <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">
  974 + <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" />
1001 <folding /> 975 <folding />
1002 </state> 976 </state>
1003 </provider> 977 </provider>
1004 </entry> 978 </entry>
1005 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 979 + <entry file="file://$PROJECT_DIR$/Gemfile">
1006 <provider selected="true" editor-type-id="text-editor"> 980 <provider selected="true" editor-type-id="text-editor">
1007 - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">  
1008 - <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" /> 981 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  982 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
1009 <folding /> 983 <folding />
1010 </state> 984 </state>
1011 </provider> 985 </provider>
@@ -1013,7 +987,15 @@ @@ -1013,7 +987,15 @@
1013 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 987 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
1014 <provider selected="true" editor-type-id="text-editor"> 988 <provider selected="true" editor-type-id="text-editor">
1015 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255"> 989 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
1016 - <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" /> 990 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  991 + <folding />
  992 + </state>
  993 + </provider>
  994 + </entry>
  995 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  996 + <provider selected="true" editor-type-id="text-editor">
  997 + <state vertical-scroll-proportion="0.0" vertical-offset="1811" max-vertical-offset="2445">
  998 + <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
1017 <folding /> 999 <folding />
1018 </state> 1000 </state>
1019 </provider> 1001 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.12) 4 + kanjai (0.0.13)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -64,12 +64,12 @@ GEM @@ -64,12 +64,12 @@ GEM
64 acts_as_tree (2.4.0) 64 acts_as_tree (2.4.0)
65 activerecord (>= 3.0.0) 65 activerecord (>= 3.0.0)
66 arel (6.0.3) 66 arel (6.0.3)
67 - aws-sdk (2.2.37)  
68 - aws-sdk-resources (= 2.2.37)  
69 - aws-sdk-core (2.2.37) 67 + aws-sdk (2.3.0)
  68 + aws-sdk-resources (= 2.3.0)
  69 + aws-sdk-core (2.3.0)
70 jmespath (~> 1.0) 70 jmespath (~> 1.0)
71 - aws-sdk-resources (2.2.37)  
72 - aws-sdk-core (= 2.2.37) 71 + aws-sdk-resources (2.3.0)
  72 + aws-sdk-core (= 2.3.0)
73 backport_new_renderer (1.0.0) 73 backport_new_renderer (1.0.0)
74 rails 74 rails
75 bcrypt (3.1.11) 75 bcrypt (3.1.11)
@@ -128,7 +128,14 @@ module Kanjai @@ -128,7 +128,14 @@ module Kanjai
128 if self.type_content == 'rte_editor' 128 if self.type_content == 'rte_editor'
129 self.text_html.to_s 129 self.text_html.to_s
130 elsif self.type_content == 'plugin' 130 elsif self.type_content == 'plugin'
131 - self.controller_name.constantize.render self.action_name.to_sym 131 + controller = self.controller_name.constantize.new
  132 + controller.send self.action_name
  133 + controller_variables = controller.instance_variables
  134 + hash = {}
  135 + controller_variables.each do |variable|
  136 + hash[variable.to_s[1..-1]] = controller.instance_variable_get(variable.to_s)
  137 + end
  138 + self.controller_name.constantize.render self.action_name.to_sym, assigns: hash
132 else 139 else
133 page_template = self.page.page_template 140 page_template = self.page.page_template
134 subpart = TemplatePart.find_by_code(self.type_content) 141 subpart = TemplatePart.find_by_code(self.type_content)
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.13" 2 + VERSION = "0.0.14"
3 end 3 end