EDIT / kanjai · Commits

Commit 4a64056054c8ab48d30539f5b6bd5d8c1f5430cf

Authored by Karpikau Andrei
1 parent 7be1a548

test

Inline Side-by-side
Showing 5 changed files with 83 additions and 69 deletions
... ... @@ -137,8 +137,8 @@
137 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
138 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139 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.36, rbenv: 2.1.3) [gem]" level="application" />
141   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.2.36, 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" />
142 142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
144 144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -74,22 +74,6 @@
74 74 </provider>
75 75 </entry>
76 76 </file>
77   - <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
78   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
79   - <provider selected="true" editor-type-id="text-editor">
80   - <state vertical-scroll-proportion="-4.7777777" vertical-offset="4281" max-vertical-offset="7155">
81   - <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="36" />
82   - <folding>
83   - <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
84   - <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
85   - <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
86   - <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
87   - <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
88   - </folding>
89   - </state>
90   - </provider>
91   - </entry>
92   - </file>
93 77 <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false">
94 78 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
95 79 <provider selected="true" editor-type-id="text-editor">
... ... @@ -128,16 +112,26 @@
128 112 </provider>
129 113 </entry>
130 114 </file>
131   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  115 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
132 116 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
133 117 <provider selected="true" editor-type-id="text-editor">
134   - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
  118 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
135 119 <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
136 120 <folding />
137 121 </state>
138 122 </provider>
139 123 </entry>
140 124 </file>
  125 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="true">
  126 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  127 + <provider selected="true" editor-type-id="text-editor">
  128 + <state vertical-scroll-proportion="0.875" vertical-offset="1481" max-vertical-offset="2115">
  129 + <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
  130 + <folding />
  131 + </state>
  132 + </provider>
  133 + </entry>
  134 + </file>
141 135 </leaf>
142 136 </component>
143 137 <component name="IdeDocumentHistory">
... ... @@ -186,7 +180,6 @@
186 180 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
187 181 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
188 182 <option value="$PROJECT_DIR$/public/test_template/index.html" />
189   - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
190 183 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" />
191 184 <option value="$PROJECT_DIR$/kanjai.gemspec" />
192 185 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
... ... @@ -194,6 +187,7 @@
194 187 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
195 188 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
196 189 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
  190 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
197 191 </list>
198 192 </option>
199 193 </component>
... ... @@ -306,6 +300,46 @@
306 300 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
307 301 </PATH_ELEMENT>
308 302 <PATH_ELEMENT>
  303 + <option name="myItemId" value="models" />
  304 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  305 + </PATH_ELEMENT>
  306 + <PATH_ELEMENT>
  307 + <option name="myItemId" value="kanjai" />
  308 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  309 + </PATH_ELEMENT>
  310 + </PATH>
  311 + <PATH>
  312 + <PATH_ELEMENT>
  313 + <option name="myItemId" value="kanjai" />
  314 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  315 + </PATH_ELEMENT>
  316 + <PATH_ELEMENT>
  317 + <option name="myItemId" value="kanjai" />
  318 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  319 + </PATH_ELEMENT>
  320 + <PATH_ELEMENT>
  321 + <option name="myItemId" value="app" />
  322 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  323 + </PATH_ELEMENT>
  324 + <PATH_ELEMENT>
  325 + <option name="myItemId" value="controllers" />
  326 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  327 + </PATH_ELEMENT>
  328 + </PATH>
  329 + <PATH>
  330 + <PATH_ELEMENT>
  331 + <option name="myItemId" value="kanjai" />
  332 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  333 + </PATH_ELEMENT>
  334 + <PATH_ELEMENT>
  335 + <option name="myItemId" value="kanjai" />
  336 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  337 + </PATH_ELEMENT>
  338 + <PATH_ELEMENT>
  339 + <option name="myItemId" value="app" />
  340 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  341 + </PATH_ELEMENT>
  342 + <PATH_ELEMENT>
309 343 <option name="myItemId" value="assets" />
310 344 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
311 345 </PATH_ELEMENT>
... ... @@ -507,7 +541,7 @@
507 541 <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" />
508 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" />
509 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" />
510   - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25767368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  544 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25767368" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
511 545 <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" />
512 546 <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" />
513 547 <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" />
... ... @@ -538,14 +572,6 @@
538 572 <watches-manager />
539 573 </component>
540 574 <component name="editorHistoryManager">
541   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
542   - <provider selected="true" editor-type-id="text-editor">
543   - <state vertical-scroll-proportion="-8.75" vertical-offset="0" max-vertical-offset="315">
544   - <caret line="14" column="82" selection-start-line="14" selection-start-column="82" selection-end-line="14" selection-end-column="82" />
545   - <folding />
546   - </state>
547   - </provider>
548   - </entry>
549 575 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb">
550 576 <provider selected="true" editor-type-id="text-editor">
551 577 <state vertical-scroll-proportion="-11.25" vertical-offset="0" max-vertical-offset="450">
... ... @@ -829,14 +855,6 @@
829 855 </state>
830 856 </provider>
831 857 </entry>
832   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
833   - <provider selected="true" editor-type-id="text-editor">
834   - <state vertical-scroll-proportion="0.0" vertical-offset="1346" max-vertical-offset="2115">
835   - <caret line="115" column="154" selection-start-line="115" selection-start-column="154" selection-end-line="115" selection-end-column="154" />
836   - <folding />
837   - </state>
838   - </provider>
839   - </entry>
840 858 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb">
841 859 <provider selected="true" editor-type-id="text-editor">
842 860 <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="420">
... ... @@ -874,7 +892,7 @@
874 892 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">
875 893 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
876 894 <folding>
877   - <element signature="n#!!doc" expanded="true" />
  895 + <element signature="n#!!doc" expanded="false" />
878 896 </folding>
879 897 </state>
880 898 </provider>
... ... @@ -884,11 +902,11 @@
884 902 <state vertical-scroll-proportion="-4.7777777" vertical-offset="4281" max-vertical-offset="7155">
885 903 <caret line="294" column="4" selection-start-line="294" selection-start-column="4" selection-end-line="294" selection-end-column="36" />
886 904 <folding>
887   - <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
888   - <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
889   - <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
890   - <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
891   - <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
  905 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
  906 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
  907 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
  908 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
  909 + <marker date="1461307505000" expanded="true" signature="-1:-1" placeholder="..." />
892 910 </folding>
893 911 </state>
894 912 </provider>
... ... @@ -967,11 +985,19 @@
967 985 </entry>
968 986 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
969 987 <provider selected="true" editor-type-id="text-editor">
970   - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
  988 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
971 989 <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
972 990 <folding />
973 991 </state>
974 992 </provider>
975 993 </entry>
  994 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  995 + <provider selected="true" editor-type-id="text-editor">
  996 + <state vertical-scroll-proportion="0.875" vertical-offset="1481" max-vertical-offset="2115">
  997 + <caret line="123" column="13" selection-start-line="123" selection-start-column="13" selection-end-line="123" selection-end-column="13" />
  998 + <folding />
  999 + </state>
  1000 + </provider>
  1001 + </entry>
976 1002 </component>
977 1003 </project>
\ No newline at end of file
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.1)
  4 + kanjai (0.0.2)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -64,12 +64,12 @@ GEM
64 64 acts_as_tree (2.4.0)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.2.36)
68   - aws-sdk-resources (= 2.2.36)
69   - aws-sdk-core (2.2.36)
  67 + aws-sdk (2.2.37)
  68 + aws-sdk-resources (= 2.2.37)
  69 + aws-sdk-core (2.2.37)
70 70 jmespath (~> 1.0)
71   - aws-sdk-resources (2.2.36)
72   - aws-sdk-core (= 2.2.36)
  71 + aws-sdk-resources (2.2.37)
  72 + aws-sdk-core (= 2.2.37)
73 73 backport_new_renderer (1.0.0)
74 74 rails
75 75 bcrypt (3.1.11)
... ...
1   -class Client::PageController < SiteController
2   -
3   - layout false
4   -
5   -
6   - def user_logo
7   -
8   - render :text => 'hello world'
9   - end
10   -
11   -
12   -end
... ... @@ -117,12 +117,12 @@ module Kanjai
117 117 end
118 118 layer.gsub!(marker, js_array.join(''))
119 119 else
120   - if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
121   - page_marker = PageMarker.new
122   - content = page_marker.method("process_#{marker.gsub('###', '')}").call(page_data)
123   - layer.gsub!(marker, content)
124   - end
125   - #look exist or not function with this name
  120 + #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
  121 + # page_marker = PageMarker.new
  122 + # content = page_marker.method("process_#{marker.gsub('###', '')}").call(page_data)
  123 + # layer.gsub!(marker, content)
  124 + #end
  125 +
126 126 end
127 127 end
128 128
... ...