EDIT / kanjai · Commits

Commit 5dbcc8d0cdbdb921609836d273920dc8d184db9e

Authored by Karpikau Andrei
1 parent 99bc30da

check include file

Inline Side-by-side
Showing 6 changed files with 114 additions and 74 deletions
... ... @@ -24,11 +24,31 @@
24 24 </component>
25 25 <component name="FileEditorManager">
26 26 <leaf>
27   - <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
28   - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  27 + <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
  28 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
29 29 <provider selected="true" editor-type-id="text-editor">
30   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
31   - <caret line="10" column="275" selection-start-line="10" selection-start-column="275" selection-end-line="10" selection-end-column="275" />
  30 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  31 + <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
  32 + <folding />
  33 + </state>
  34 + </provider>
  35 + </entry>
  36 + </file>
  37 + <file leaf-file-name="frontend.css.scss" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
  39 + <provider selected="true" editor-type-id="text-editor">
  40 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="345">
  41 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  42 + <folding />
  43 + </state>
  44 + </provider>
  45 + </entry>
  46 + </file>
  47 + <file leaf-file-name="bootstrap.css.scss.erb" pinned="false" current-in-tab="false">
  48 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
  49 + <provider selected="true" editor-type-id="text-editor">
  50 + <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
  51 + <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
32 52 <folding />
33 53 </state>
34 54 </provider>
... ... @@ -57,8 +77,8 @@
57 77 <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
58 78 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
59 79 <provider selected="true" editor-type-id="text-editor">
60   - <state vertical-scroll-proportion="0.0" vertical-offset="2172" max-vertical-offset="4005">
61   - <caret line="165" column="94" selection-start-line="165" selection-start-column="94" selection-end-line="165" selection-end-column="94" />
  80 + <state vertical-scroll-proportion="0.0" vertical-offset="2187" max-vertical-offset="4005">
  81 + <caret line="155" column="63" selection-start-line="155" selection-start-column="63" selection-end-line="155" selection-end-column="63" />
62 82 <folding />
63 83 </state>
64 84 </provider>
... ... @@ -84,16 +104,6 @@
84 104 </provider>
85 105 </entry>
86 106 </file>
87   - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
88   - <entry file="file://$PROJECT_DIR$/Gemfile">
89   - <provider selected="true" editor-type-id="text-editor">
90   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
91   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
92   - <folding />
93   - </state>
94   - </provider>
95   - </entry>
96   - </file>
97 107 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
98 108 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
99 109 <provider selected="true" editor-type-id="text-editor">
... ... @@ -104,21 +114,11 @@
104 114 </provider>
105 115 </entry>
106 116 </file>
107   - <file leaf-file-name="401.html.erb" pinned="false" current-in-tab="false">
108   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
109   - <provider selected="true" editor-type-id="text-editor">
110   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
111   - <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
112   - <folding />
113   - </state>
114   - </provider>
115   - </entry>
116   - </file>
117 117 <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
118 118 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
119 119 <provider selected="true" editor-type-id="text-editor">
120   - <state vertical-scroll-proportion="0.0" vertical-offset="135" max-vertical-offset="885">
121   - <caret line="32" column="22" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="22" />
  120 + <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="885">
  121 + <caret line="48" column="7" selection-start-line="48" selection-start-column="7" selection-end-line="48" selection-end-column="7" />
122 122 <folding />
123 123 </state>
124 124 </provider>
... ... @@ -129,7 +129,6 @@
129 129 <component name="IdeDocumentHistory">
130 130 <option name="CHANGED_PATHS">
131 131 <list>
132   - <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
133 132 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
134 133 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
135 134 <option value="$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb" />
... ... @@ -158,7 +157,6 @@
158 157 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb" />
159 158 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb" />
160 159 <option value="$PROJECT_DIR$/config/routes.rb" />
161   - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
162 160 <option value="$PROJECT_DIR$/public/test_template/index.html" />
163 161 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" />
164 162 <option value="$PROJECT_DIR$/kanjai.gemspec" />
... ... @@ -177,8 +175,10 @@
177 175 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
178 176 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
179 177 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
180   - <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
181 178 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
  179 + <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  180 + <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
  181 + <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
182 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 183 </list>
184 184 </option>
... ... @@ -262,6 +262,24 @@
262 262 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
263 263 </PATH_ELEMENT>
264 264 <PATH_ELEMENT>
  265 + <option name="myItemId" value="tasks" />
  266 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  267 + </PATH_ELEMENT>
  268 + </PATH>
  269 + <PATH>
  270 + <PATH_ELEMENT>
  271 + <option name="myItemId" value="kanjai" />
  272 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  273 + </PATH_ELEMENT>
  274 + <PATH_ELEMENT>
  275 + <option name="myItemId" value="kanjai" />
  276 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  277 + </PATH_ELEMENT>
  278 + <PATH_ELEMENT>
  279 + <option name="myItemId" value="lib" />
  280 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  281 + </PATH_ELEMENT>
  282 + <PATH_ELEMENT>
265 283 <option name="myItemId" value="kanjai" />
266 284 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
267 285 </PATH_ELEMENT>
... ... @@ -308,7 +326,11 @@
308 326 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
309 327 </PATH_ELEMENT>
310 328 <PATH_ELEMENT>
311   - <option name="myItemId" value="controllers" />
  329 + <option name="myItemId" value="assets" />
  330 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  331 + </PATH_ELEMENT>
  332 + <PATH_ELEMENT>
  333 + <option name="myItemId" value="stylesheets" />
312 334 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
313 335 </PATH_ELEMENT>
314 336 <PATH_ELEMENT>
... ... @@ -316,6 +338,24 @@
316 338 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
317 339 </PATH_ELEMENT>
318 340 </PATH>
  341 + <PATH>
  342 + <PATH_ELEMENT>
  343 + <option name="myItemId" value="kanjai" />
  344 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  345 + </PATH_ELEMENT>
  346 + <PATH_ELEMENT>
  347 + <option name="myItemId" value="kanjai" />
  348 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  349 + </PATH_ELEMENT>
  350 + <PATH_ELEMENT>
  351 + <option name="myItemId" value="app" />
  352 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  353 + </PATH_ELEMENT>
  354 + <PATH_ELEMENT>
  355 + <option name="myItemId" value="assets" />
  356 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  357 + </PATH_ELEMENT>
  358 + </PATH>
319 359 </subPane>
320 360 </pane>
321 361 </panes>
... ... @@ -633,13 +673,6 @@
633 673 </state>
634 674 </provider>
635 675 </entry>
636   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
637   - <provider selected="true" editor-type-id="text-editor">
638   - <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
639   - <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
640   - </state>
641   - </provider>
642   - </entry>
643 676 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss">
644 677 <provider selected="true" editor-type-id="text-editor">
645 678 <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="105">
... ... @@ -654,13 +687,6 @@
654 687 </state>
655 688 </provider>
656 689 </entry>
657   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
658   - <provider selected="true" editor-type-id="text-editor">
659   - <state vertical-scroll-proportion="-11.875" vertical-offset="0" max-vertical-offset="375">
660   - <caret line="19" column="39" selection-start-line="19" selection-start-column="39" selection-end-line="19" selection-end-column="39" />
661   - </state>
662   - </provider>
663   - </entry>
664 690 <entry file="file://$PROJECT_DIR$/../cms_test/bin/delayed_job">
665 691 <provider selected="true" editor-type-id="text-editor">
666 692 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -806,14 +832,6 @@
806 832 </state>
807 833 </provider>
808 834 </entry>
809   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
810   - <provider selected="true" editor-type-id="text-editor">
811   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
812   - <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
813   - <folding />
814   - </state>
815   - </provider>
816   - </entry>
817 835 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
818 836 <provider selected="true" editor-type-id="text-editor">
819 837 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
... ... @@ -870,42 +888,66 @@
870 888 </state>
871 889 </provider>
872 890 </entry>
  891 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  892 + <provider selected="true" editor-type-id="text-editor">
  893 + <state vertical-scroll-proportion="0.0" vertical-offset="731" max-vertical-offset="1425">
  894 + <caret line="83" column="35" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" />
  895 + <folding />
  896 + </state>
  897 + </provider>
  898 + </entry>
  899 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  900 + <provider selected="true" editor-type-id="text-editor">
  901 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  902 + <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
  903 + <folding />
  904 + </state>
  905 + </provider>
  906 + </entry>
873 907 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
874 908 <provider selected="true" editor-type-id="text-editor">
875   - <state vertical-scroll-proportion="0.0" vertical-offset="1526" max-vertical-offset="2160">
  909 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2160">
876 910 <caret line="29" column="0" selection-start-line="29" selection-start-column="0" selection-end-line="29" selection-end-column="0" />
877 911 <folding />
878 912 </state>
879 913 </provider>
880 914 </entry>
  915 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  916 + <provider selected="true" editor-type-id="text-editor">
  917 + <state vertical-scroll-proportion="0.0" vertical-offset="2187" max-vertical-offset="4005">
  918 + <caret line="155" column="63" selection-start-line="155" selection-start-column="63" selection-end-line="155" selection-end-column="63" />
  919 + <folding />
  920 + </state>
  921 + </provider>
  922 + </entry>
881 923 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
882 924 <provider selected="true" editor-type-id="text-editor">
883   - <state vertical-scroll-proportion="0.0" vertical-offset="135" max-vertical-offset="885">
884   - <caret line="32" column="22" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="22" />
  925 + <state vertical-scroll-proportion="0.0" vertical-offset="251" max-vertical-offset="885">
  926 + <caret line="48" column="7" selection-start-line="48" selection-start-column="7" selection-end-line="48" selection-end-column="7" />
885 927 <folding />
886 928 </state>
887 929 </provider>
888 930 </entry>
889   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  931 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
890 932 <provider selected="true" editor-type-id="text-editor">
891   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
892   - <caret line="12" column="13" selection-start-line="12" selection-start-column="6" selection-end-line="12" selection-end-column="13" />
  933 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  934 + <caret line="15" column="33" selection-start-line="15" selection-start-column="33" selection-end-line="15" selection-end-column="33" />
893 935 <folding />
894 936 </state>
895 937 </provider>
896 938 </entry>
897   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  939 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
898 940 <provider selected="true" editor-type-id="text-editor">
899   - <state vertical-scroll-proportion="0.0" vertical-offset="731" max-vertical-offset="1425">
900   - <caret line="83" column="35" selection-start-line="83" selection-start-column="35" selection-end-line="83" selection-end-column="35" />
  941 + <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
  942 + <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
901 943 <folding />
902 944 </state>
903 945 </provider>
904 946 </entry>
905   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  947 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
906 948 <provider selected="true" editor-type-id="text-editor">
907   - <state vertical-scroll-proportion="0.0" vertical-offset="2172" max-vertical-offset="4005">
908   - <caret line="165" column="94" selection-start-line="165" selection-start-column="94" selection-end-line="165" selection-end-column="94" />
  949 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  950 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
909 951 <folding />
910 952 </state>
911 953 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.18)
  4 + kanjai (0.0.19)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
1   -//= require kanjai/bootstrap
2   -
3 1 //= require kanjai/froala_editor/froala_editor
4 2 //= require kanjai/froala_editor/froala_style
5 3 //= require kanjai/froala_editor/themes/gray
... ...
... ... @@ -40,7 +40,7 @@ module Kanjai
40 40 root_page = Page.where(root_page: true).first
41 41 if root_page
42 42 page_data = root_page.page_data.where(lang: I18n.locale).first
43   - redirect_to page_data.url.to_s
  43 + redirect_to root_page.menu_url($scheme)
44 44 end
45 45 end
46 46 end
... ...
1 1 module Kanjai
2   - VERSION = "0.0.19"
  2 + VERSION = "0.0.20"
3 3 end
... ...
... ... @@ -10,10 +10,10 @@ namespace :install do
10 10 end
11 11
12 12 task :zip_example => :environment do
13   - if File.exist?("#{Rails.root}/public/test_template/zipfilename.zip")
14   - sh "rm #{Rails.root}/public/test_template/zipfilename.zip"
  13 + if File.exist?("#{Rails.root}/public/site_template/zipfilename.zip")
  14 + sh "rm #{Rails.root}/public/site_template/zipfilename.zip"
15 15 end
16   - cd "#{Rails.root}/public/test_template"
  16 + cd "#{Rails.root}/public/site_template"
17 17 sh "zip -r0 zipfilename.zip *"
18 18 end
19 19
... ...