EDIT / kanjai · Commits

Commit 04e9a55c7993553f10f3e753affade6b44bda3c9

Authored by Karpikau Andrei
1 parent a7577196

show wrapper without any process

Inline Side-by-side
Showing 4 changed files with 105 additions and 136 deletions
@@ -25,16 +25,6 @@ @@ -25,16 +25,6 @@
25 </component> 25 </component>
26 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
27 <leaf> 27 <leaf>
28 - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">  
30 - <provider selected="true" editor-type-id="text-editor">  
31 - <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="990">  
32 - <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />  
33 - <folding />  
34 - </state>  
35 - </provider>  
36 - </entry>  
37 - </file>  
38 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true"> 28 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
39 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 29 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
40 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
@@ -48,8 +38,38 @@ @@ -48,8 +38,38 @@
48 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 38 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
49 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 39 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
50 <provider selected="true" editor-type-id="text-editor"> 40 <provider selected="true" editor-type-id="text-editor">
51 - <state vertical-scroll-proportion="-13.037037" vertical-offset="38" max-vertical-offset="2505">  
52 - <caret line="26" column="94" selection-start-line="26" selection-start-column="80" selection-end-line="26" selection-end-column="94" /> 41 + <state vertical-scroll-proportion="19.74074" vertical-offset="1268" max-vertical-offset="2505">
  42 + <caret line="49" column="26" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="26" />
  43 + <folding />
  44 + </state>
  45 + </provider>
  46 + </entry>
  47 + </file>
  48 + <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  50 + <provider selected="true" editor-type-id="text-editor">
  51 + <state vertical-scroll-proportion="-18.037037" vertical-offset="443" max-vertical-offset="2055">
  52 + <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
  53 + <folding />
  54 + </state>
  55 + </provider>
  56 + </entry>
  57 + </file>
  58 + <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  60 + <provider selected="true" editor-type-id="text-editor">
  61 + <state vertical-scroll-proportion="-7.4814816" vertical-offset="1538" max-vertical-offset="2445">
  62 + <caret line="116" column="19" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="19" />
  63 + <folding />
  64 + </state>
  65 + </provider>
  66 + </entry>
  67 + </file>
  68 + <file leaf-file-name="README.rdoc" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/README.rdoc">
  70 + <provider selected="true" editor-type-id="text-editor">
  71 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="120">
  72 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
53 <folding /> 73 <folding />
54 </state> 74 </state>
55 </provider> 75 </provider>
@@ -78,7 +98,7 @@ @@ -78,7 +98,7 @@
78 <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false"> 98 <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
79 <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb"> 99 <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
80 <provider selected="true" editor-type-id="text-editor"> 100 <provider selected="true" editor-type-id="text-editor">
81 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180"> 101 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="180">
82 <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" /> 102 <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
83 <folding /> 103 <folding />
84 </state> 104 </state>
@@ -89,37 +109,17 @@ @@ -89,37 +109,17 @@
89 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb"> 109 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
90 <provider selected="true" editor-type-id="text-editor"> 110 <provider selected="true" editor-type-id="text-editor">
91 <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110"> 111 <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
92 - <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" /> 112 + <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
93 <folding /> 113 <folding />
94 </state> 114 </state>
95 </provider> 115 </provider>
96 </entry> 116 </entry>
97 </file> 117 </file>
98 - <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">  
99 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb"> 118 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
100 <provider selected="true" editor-type-id="text-editor"> 120 <provider selected="true" editor-type-id="text-editor">
101 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">  
102 - <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />  
103 - <folding />  
104 - </state>  
105 - </provider>  
106 - </entry>  
107 - </file>  
108 - <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">  
109 - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">  
110 - <provider selected="true" editor-type-id="text-editor">  
111 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">  
112 - <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />  
113 - <folding />  
114 - </state>  
115 - </provider>  
116 - </entry>  
117 - </file>  
118 - <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">  
119 - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">  
120 - <provider selected="true" editor-type-id="text-editor">  
121 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">  
122 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 121 + <state vertical-scroll-proportion="0.0" vertical-offset="2265" max-vertical-offset="4380">
  122 + <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
123 <folding /> 123 <folding />
124 </state> 124 </state>
125 </provider> 125 </provider>
@@ -172,7 +172,6 @@ @@ -172,7 +172,6 @@
172 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 172 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
173 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" /> 173 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
174 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" /> 174 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
175 - <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />  
176 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" /> 175 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
177 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 176 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
178 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" /> 177 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
@@ -180,6 +179,7 @@ @@ -180,6 +179,7 @@
180 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" /> 179 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
181 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 180 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
182 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" /> 181 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
  182 + <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
183 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 183 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
184 </list> 184 </list>
185 </option> 185 </option>
@@ -215,8 +215,8 @@ @@ -215,8 +215,8 @@
215 <sortByType /> 215 <sortByType />
216 </navigator> 216 </navigator>
217 <panes> 217 <panes>
218 - <pane id="RailsProjectView" />  
219 <pane id="Scope" /> 218 <pane id="Scope" />
  219 + <pane id="RailsProjectView" />
220 <pane id="ProjectPane"> 220 <pane id="ProjectPane">
221 <subPane> 221 <subPane>
222 <PATH> 222 <PATH>
@@ -295,38 +295,6 @@ @@ -295,38 +295,6 @@
295 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 295 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
296 </PATH_ELEMENT> 296 </PATH_ELEMENT>
297 <PATH_ELEMENT> 297 <PATH_ELEMENT>
298 - <option name="myItemId" value="config" />  
299 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
300 - </PATH_ELEMENT>  
301 - </PATH>  
302 - <PATH>  
303 - <PATH_ELEMENT>  
304 - <option name="myItemId" value="kanjai" />  
305 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
306 - </PATH_ELEMENT>  
307 - <PATH_ELEMENT>  
308 - <option name="myItemId" value="kanjai" />  
309 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
310 - </PATH_ELEMENT>  
311 - <PATH_ELEMENT>  
312 - <option name="myItemId" value="config" />  
313 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
314 - </PATH_ELEMENT>  
315 - <PATH_ELEMENT>  
316 - <option name="myItemId" value="initializers" />  
317 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
318 - </PATH_ELEMENT>  
319 - </PATH>  
320 - <PATH>  
321 - <PATH_ELEMENT>  
322 - <option name="myItemId" value="kanjai" />  
323 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />  
324 - </PATH_ELEMENT>  
325 - <PATH_ELEMENT>  
326 - <option name="myItemId" value="kanjai" />  
327 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
328 - </PATH_ELEMENT>  
329 - <PATH_ELEMENT>  
330 <option name="myItemId" value="app" /> 298 <option name="myItemId" value="app" />
331 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 299 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
332 </PATH_ELEMENT> 300 </PATH_ELEMENT>
@@ -630,20 +598,20 @@ @@ -630,20 +598,20 @@
630 <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" /> 598 <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" />
631 <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" /> 599 <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" />
632 <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" /> 600 <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" />
633 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32471728" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 601 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34006462" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
634 <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" /> 602 <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" />
635 <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" /> 603 <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" />
636 <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" /> 604 <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" />
637 <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" /> 605 <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" />
638 <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" /> 606 <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" />
639 - <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" />  
640 <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" /> 607 <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" />
  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" />
641 <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" /> 609 <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" />
642 <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" /> 610 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
643 <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" /> 611 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
644 - <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" />  
645 - <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" />  
646 <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" /> 612 <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" />
  613 + <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" />
  614 + <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" />
647 </layout> 615 </layout>
648 </component> 616 </component>
649 <component name="Vcs.Log.UiProperties"> 617 <component name="Vcs.Log.UiProperties">
@@ -688,13 +656,6 @@ @@ -688,13 +656,6 @@
688 </state> 656 </state>
689 </provider> 657 </provider>
690 </entry> 658 </entry>
691 - <entry file="file://$PROJECT_DIR$/README.rdoc">  
692 - <provider selected="true" editor-type-id="text-editor">  
693 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
694 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
695 - </state>  
696 - </provider>  
697 - </entry>  
698 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js"> 659 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
699 <provider selected="true" editor-type-id="text-editor"> 660 <provider selected="true" editor-type-id="text-editor">
700 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 661 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -730,13 +691,6 @@ @@ -730,13 +691,6 @@
730 </state> 691 </state>
731 </provider> 692 </provider>
732 </entry> 693 </entry>
733 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">  
734 - <provider selected="true" editor-type-id="text-editor">  
735 - <state vertical-scroll-proportion="4.9399037" vertical-offset="0" max-vertical-offset="2445">  
736 - <caret line="137" column="86" selection-start-line="130" selection-start-column="0" selection-end-line="137" selection-end-column="86" />  
737 - </state>  
738 - </provider>  
739 - </entry>  
740 <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb"> 694 <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
741 <provider selected="true" editor-type-id="text-editor"> 695 <provider selected="true" editor-type-id="text-editor">
742 <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="2520"> 696 <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="2520">
@@ -779,13 +733,6 @@ @@ -779,13 +733,6 @@
779 </state> 733 </state>
780 </provider> 734 </provider>
781 </entry> 735 </entry>
782 - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">  
783 - <provider selected="true" editor-type-id="text-editor">  
784 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1995">  
785 - <caret line="1" column="27" selection-start-line="1" selection-start-column="27" selection-end-line="1" selection-end-column="27" />  
786 - </state>  
787 - </provider>  
788 - </entry>  
789 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/_new_form.html.erb"> 736 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/_new_form.html.erb">
790 <provider selected="true" editor-type-id="text-editor"> 737 <provider selected="true" editor-type-id="text-editor">
791 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 738 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -895,7 +842,6 @@ @@ -895,7 +842,6 @@
895 <provider selected="true" editor-type-id="text-editor"> 842 <provider selected="true" editor-type-id="text-editor">
896 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 843 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
897 <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" /> 844 <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
898 - <folding />  
899 </state> 845 </state>
900 </provider> 846 </provider>
901 </entry> 847 </entry>
@@ -911,7 +857,6 @@ @@ -911,7 +857,6 @@
911 <provider selected="true" editor-type-id="text-editor"> 857 <provider selected="true" editor-type-id="text-editor">
912 <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140"> 858 <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
913 <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" /> 859 <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
914 - <folding />  
915 </state> 860 </state>
916 </provider> 861 </provider>
917 </entry> 862 </entry>
@@ -933,38 +878,60 @@ @@ -933,38 +878,60 @@
933 <provider selected="true" editor-type-id="text-editor"> 878 <provider selected="true" editor-type-id="text-editor">
934 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 879 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
935 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 880 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  881 + </state>
  882 + </provider>
  883 + </entry>
  884 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/admin_user.rb">
  885 + <provider selected="true" editor-type-id="text-editor">
  886 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  887 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  888 + </state>
  889 + </provider>
  890 + </entry>
  891 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  892 + <provider selected="true" editor-type-id="text-editor">
  893 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="990">
  894 + <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
936 <folding /> 895 <folding />
937 </state> 896 </state>
938 </provider> 897 </provider>
939 </entry> 898 </entry>
940 - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 899 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
941 <provider selected="true" editor-type-id="text-editor"> 900 <provider selected="true" editor-type-id="text-editor">
942 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">  
943 - <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" /> 901 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  902 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
944 <folding /> 903 <folding />
945 </state> 904 </state>
946 </provider> 905 </provider>
947 </entry> 906 </entry>
948 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 907 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
949 <provider selected="true" editor-type-id="text-editor"> 908 <provider selected="true" editor-type-id="text-editor">
950 - <state vertical-scroll-proportion="0.0" vertical-offset="2370" max-vertical-offset="4380">  
951 - <caret line="150" column="36" selection-start-line="150" selection-start-column="36" selection-end-line="150" selection-end-column="60" /> 909 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  910 + <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
952 <folding /> 911 <folding />
953 </state> 912 </state>
954 </provider> 913 </provider>
955 </entry> 914 </entry>
956 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/admin_user.rb"> 915 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
957 <provider selected="true" editor-type-id="text-editor"> 916 <provider selected="true" editor-type-id="text-editor">
958 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
959 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 917 + <state vertical-scroll-proportion="0.0" vertical-offset="296" max-vertical-offset="1410">
  918 + <caret line="25" column="23" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="23" />
960 <folding /> 919 <folding />
961 </state> 920 </state>
962 </provider> 921 </provider>
963 </entry> 922 </entry>
964 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 923 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
965 <provider selected="true" editor-type-id="text-editor"> 924 <provider selected="true" editor-type-id="text-editor">
966 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="990">  
967 - <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" /> 925 + <state vertical-scroll-proportion="0.0" vertical-offset="11" max-vertical-offset="735">
  926 + <caret line="39" column="15" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
  927 + <folding />
  928 + </state>
  929 + </provider>
  930 + </entry>
  931 + <entry file="file://$PROJECT_DIR$/README.rdoc">
  932 + <provider selected="true" editor-type-id="text-editor">
  933 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  934 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
968 <folding /> 935 <folding />
969 </state> 936 </state>
970 </provider> 937 </provider>
@@ -973,22 +940,20 @@ @@ -973,22 +940,20 @@
973 <provider selected="true" editor-type-id="text-editor"> 940 <provider selected="true" editor-type-id="text-editor">
974 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 941 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
975 <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" /> 942 <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
976 - <folding />  
977 </state> 943 </state>
978 </provider> 944 </provider>
979 </entry> 945 </entry>
980 - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb"> 946 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
981 <provider selected="true" editor-type-id="text-editor"> 947 <provider selected="true" editor-type-id="text-editor">
982 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">  
983 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
984 - <folding /> 948 + <state vertical-scroll-proportion="0.26025236" vertical-offset="0" max-vertical-offset="634">
  949 + <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
985 </state> 950 </state>
986 </provider> 951 </provider>
987 </entry> 952 </entry>
988 - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb"> 953 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
989 <provider selected="true" editor-type-id="text-editor"> 954 <provider selected="true" editor-type-id="text-editor">
990 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">  
991 - <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" /> 955 + <state vertical-scroll-proportion="0.30757096" vertical-offset="0" max-vertical-offset="634">
  956 + <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
992 <folding /> 957 <folding />
993 </state> 958 </state>
994 </provider> 959 </provider>
@@ -996,39 +961,39 @@ @@ -996,39 +961,39 @@
996 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb"> 961 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
997 <provider selected="true" editor-type-id="text-editor"> 962 <provider selected="true" editor-type-id="text-editor">
998 <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110"> 963 <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
999 - <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" /> 964 + <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
1000 <folding /> 965 <folding />
1001 </state> 966 </state>
1002 </provider> 967 </provider>
1003 </entry> 968 </entry>
1004 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb"> 969 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
1005 <provider selected="true" editor-type-id="text-editor"> 970 <provider selected="true" editor-type-id="text-editor">
1006 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">  
1007 - <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" /> 971 + <state vertical-scroll-proportion="0.0" vertical-offset="2265" max-vertical-offset="4380">
  972 + <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
1008 <folding /> 973 <folding />
1009 </state> 974 </state>
1010 </provider> 975 </provider>
1011 </entry> 976 </entry>
1012 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb"> 977 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1013 <provider selected="true" editor-type-id="text-editor"> 978 <provider selected="true" editor-type-id="text-editor">
1014 - <state vertical-scroll-proportion="0.0" vertical-offset="296" max-vertical-offset="1410">  
1015 - <caret line="25" column="23" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="23" /> 979 + <state vertical-scroll-proportion="19.74074" vertical-offset="1268" max-vertical-offset="2505">
  980 + <caret line="49" column="26" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="26" />
1016 <folding /> 981 <folding />
1017 </state> 982 </state>
1018 </provider> 983 </provider>
1019 </entry> 984 </entry>
1020 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb"> 985 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
1021 <provider selected="true" editor-type-id="text-editor"> 986 <provider selected="true" editor-type-id="text-editor">
1022 - <state vertical-scroll-proportion="0.0" vertical-offset="11" max-vertical-offset="735">  
1023 - <caret line="39" column="15" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" /> 987 + <state vertical-scroll-proportion="-7.4814816" vertical-offset="1538" max-vertical-offset="2445">
  988 + <caret line="116" column="19" selection-start-line="116" selection-start-column="8" selection-end-line="116" selection-end-column="19" />
1024 <folding /> 989 <folding />
1025 </state> 990 </state>
1026 </provider> 991 </provider>
1027 </entry> 992 </entry>
1028 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 993 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
1029 <provider selected="true" editor-type-id="text-editor"> 994 <provider selected="true" editor-type-id="text-editor">
1030 - <state vertical-scroll-proportion="-13.037037" vertical-offset="38" max-vertical-offset="2505">  
1031 - <caret line="26" column="94" selection-start-line="26" selection-start-column="80" selection-end-line="26" selection-end-column="94" /> 995 + <state vertical-scroll-proportion="-18.037037" vertical-offset="443" max-vertical-offset="2055">
  996 + <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
1032 <folding /> 997 <folding />
1033 </state> 998 </state>
1034 </provider> 999 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.38) 4 + kanjai (0.0.39)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -54,8 +54,12 @@ module Kanjai @@ -54,8 +54,12 @@ module Kanjai
54 html_attributes['data-id'] = row['attributes']['id'] 54 html_attributes['data-id'] = row['attributes']['id']
55 html_attributes['data-page_data_id'] = page_data.id 55 html_attributes['data-page_data_id'] = page_data.id
56 56
57 - html += ActionController::Base.helpers.content_tag(:div, '', html_attributes) do  
58 - ActionController::Base.helpers.concat((page_content.nil? ? '' : page_content.get_content_frontend).html_safe) 57 + if page_content.type_content.split('-').include?('wrapper')
  58 + html += ActionController::Base.helpers.concat((page_content.nil? ? '' : page_content.get_content_frontend).html_safe)
  59 + else
  60 + html += ActionController::Base.helpers.content_tag(:div, '', html_attributes) do
  61 + ActionController::Base.helpers.concat((page_content.nil? ? '' : page_content.get_content_frontend).html_safe)
  62 + end
59 end 63 end
60 64
61 else 65 else
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.39" 2 + VERSION = "0.0.40"
3 end 3 end