EDIT / kanjai · Commits

Commit 06d1c96e4378d6afa99cdcb4b7b69404d5a10b34

Authored by Karpikau Andrei
1 parent f76e0333

show wrapper without any process

Inline Side-by-side
Showing 5 changed files with 16 additions and 11 deletions
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb"> 49 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
50 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
51 <state vertical-scroll-proportion="-15.259259" vertical-offset="443" max-vertical-offset="2055"> 51 <state vertical-scroll-proportion="-15.259259" vertical-offset="443" max-vertical-offset="2055">
52 - <caret line="57" column="90" selection-start-line="57" selection-start-column="90" selection-end-line="57" selection-end-column="90" /> 52 + <caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" />
53 <folding /> 53 <folding />
54 </state> 54 </state>
55 </provider> 55 </provider>
@@ -58,8 +58,8 @@ @@ -58,8 +58,8 @@
58 <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false"> 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"> 59 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
60 <provider selected="true" editor-type-id="text-editor"> 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" /> 61 + <state vertical-scroll-proportion="-8.592592" vertical-offset="1658" max-vertical-offset="2520">
  62 + <caret line="126" column="28" selection-start-line="126" selection-start-column="8" selection-end-line="126" selection-end-column="28" />
63 <folding /> 63 <folding />
64 </state> 64 </state>
65 </provider> 65 </provider>
@@ -162,7 +162,6 @@ @@ -162,7 +162,6 @@
162 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" /> 162 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
163 <option value="$PROJECT_DIR$/config/initializers/devise.rb" /> 163 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
164 <option value="$PROJECT_DIR$/lib/kanjai.rb" /> 164 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
165 - <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />  
166 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" /> 165 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" />
167 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" /> 166 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />
168 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" /> 167 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
@@ -179,6 +178,7 @@ @@ -179,6 +178,7 @@
179 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" /> 178 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
180 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 179 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
181 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" /> 180 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
  181 + <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
182 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.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>
@@ -598,7 +598,7 @@ @@ -598,7 +598,7 @@
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" /> 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" />
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" /> 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" />
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" /> 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" />
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" /> 601 + <window_info id="Project" active="true" 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" />
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" /> 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" />
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" /> 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" />
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" /> 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" />
@@ -984,8 +984,8 @@ @@ -984,8 +984,8 @@
984 </entry> 984 </entry>
985 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb"> 985 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
986 <provider selected="true" editor-type-id="text-editor"> 986 <provider selected="true" editor-type-id="text-editor">
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" /> 987 + <state vertical-scroll-proportion="-8.592592" vertical-offset="1658" max-vertical-offset="2520">
  988 + <caret line="126" column="28" selection-start-line="126" selection-start-column="8" selection-end-line="126" selection-end-column="28" />
989 <folding /> 989 <folding />
990 </state> 990 </state>
991 </provider> 991 </provider>
@@ -993,7 +993,7 @@ @@ -993,7 +993,7 @@
993 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb"> 993 <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
994 <provider selected="true" editor-type-id="text-editor"> 994 <provider selected="true" editor-type-id="text-editor">
995 <state vertical-scroll-proportion="-15.259259" vertical-offset="443" max-vertical-offset="2055"> 995 <state vertical-scroll-proportion="-15.259259" vertical-offset="443" max-vertical-offset="2055">
996 - <caret line="57" column="90" selection-start-line="57" selection-start-column="90" selection-end-line="57" selection-end-column="90" /> 996 + <caret line="57" column="20" selection-start-line="57" selection-start-column="20" selection-end-line="57" selection-end-column="20" />
997 <folding /> 997 <folding />
998 </state> 998 </state>
999 </provider> 999 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.40) 4 + kanjai (0.0.41)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -55,7 +55,7 @@ module Kanjai @@ -55,7 +55,7 @@ module Kanjai
55 html_attributes['data-page_data_id'] = page_data.id 55 html_attributes['data-page_data_id'] = page_data.id
56 56
57 if page_content.type_content.split('-').include?('wrapper') 57 if page_content.type_content.split('-').include?('wrapper')
58 - html += (page_content.nil? ? '' : page_content.get_content_frontend).html_safe 58 + html += (page_content.get_content_frontend).html_safe
59 else 59 else
60 html += ActionController::Base.helpers.content_tag(:div, '', html_attributes) do 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) 61 ActionController::Base.helpers.concat((page_content.nil? ? '' : page_content.get_content_frontend).html_safe)
@@ -144,6 +144,11 @@ module Kanjai @@ -144,6 +144,11 @@ module Kanjai
144 end 144 end
145 end 145 end
146 146
  147 + def get_simple_content
  148 + subpart = TemplatePart.find_by_code(self.type_content)
  149 + subpart.source
  150 + end
  151 +
147 152
148 def marker_hash 153 def marker_hash
149 result = {} 154 result = {}
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.41" 2 + VERSION = "0.0.42"
3 end 3 end