EDIT / kanjai · Commits

Commit 54b62e7143fad0b03e1f145f88c38d7694fafe73

Authored by Karpikau Andrei
1 parent cc5d8d8d

test

Inline Side-by-side
Showing 4 changed files with 66 additions and 36 deletions
@@ -37,8 +37,8 @@ @@ -37,8 +37,8 @@
37 <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false"> 37 <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">
38 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb"> 38 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="285">  
41 - <caret line="13" column="140" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="140" /> 40 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  41 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
42 <folding /> 42 <folding />
43 </state> 43 </state>
44 </provider> 44 </provider>
@@ -82,11 +82,11 @@ @@ -82,11 +82,11 @@
82 </provider> 82 </provider>
83 </entry> 83 </entry>
84 </file> 84 </file>
85 - <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false">  
86 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb"> 85 + <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">
  86 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
87 <provider selected="true" editor-type-id="text-editor"> 87 <provider selected="true" editor-type-id="text-editor">
88 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">  
89 - <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" /> 88 + <state vertical-scroll-proportion="8.333333" vertical-offset="200" max-vertical-offset="810">
  89 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
90 <folding /> 90 <folding />
91 </state> 91 </state>
92 </provider> 92 </provider>
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true"> 95 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
96 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 96 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
97 <provider selected="true" editor-type-id="text-editor"> 97 <provider selected="true" editor-type-id="text-editor">
98 - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416"> 98 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
99 <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" /> 99 <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
100 <folding /> 100 <folding />
101 </state> 101 </state>
@@ -167,7 +167,6 @@ @@ -167,7 +167,6 @@
167 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb" /> 167 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb" />
168 <option value="$PROJECT_DIR$/config/routes.rb" /> 168 <option value="$PROJECT_DIR$/config/routes.rb" />
169 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" /> 169 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
170 - <option value="$PROJECT_DIR$/config/initializers/assets.rb" />  
171 <option value="$PROJECT_DIR$/public/test_template/index.html" /> 170 <option value="$PROJECT_DIR$/public/test_template/index.html" />
172 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" /> 171 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" />
173 <option value="$PROJECT_DIR$/kanjai.gemspec" /> 172 <option value="$PROJECT_DIR$/kanjai.gemspec" />
@@ -177,6 +176,7 @@ @@ -177,6 +176,7 @@
177 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 176 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
178 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" /> 177 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
179 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 178 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
  179 + <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
180 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 180 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
181 </list> 181 </list>
182 </option> 182 </option>
@@ -307,6 +307,50 @@ @@ -307,6 +307,50 @@
307 <option name="myItemId" value="app" /> 307 <option name="myItemId" value="app" />
308 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 308 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
309 </PATH_ELEMENT> 309 </PATH_ELEMENT>
  310 + <PATH_ELEMENT>
  311 + <option name="myItemId" value="views" />
  312 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  313 + </PATH_ELEMENT>
  314 + <PATH_ELEMENT>
  315 + <option name="myItemId" value="layouts" />
  316 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  317 + </PATH_ELEMENT>
  318 + <PATH_ELEMENT>
  319 + <option name="myItemId" value="kanjai" />
  320 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  321 + </PATH_ELEMENT>
  322 + </PATH>
  323 + <PATH>
  324 + <PATH_ELEMENT>
  325 + <option name="myItemId" value="kanjai" />
  326 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  327 + </PATH_ELEMENT>
  328 + <PATH_ELEMENT>
  329 + <option name="myItemId" value="kanjai" />
  330 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  331 + </PATH_ELEMENT>
  332 + <PATH_ELEMENT>
  333 + <option name="myItemId" value="app" />
  334 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  335 + </PATH_ELEMENT>
  336 + <PATH_ELEMENT>
  337 + <option name="myItemId" value="views" />
  338 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  339 + </PATH_ELEMENT>
  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>
310 </PATH> 354 </PATH>
311 <PATH> 355 <PATH>
312 <PATH_ELEMENT> 356 <PATH_ELEMENT>
@@ -532,7 +576,7 @@ @@ -532,7 +576,7 @@
532 <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" /> 576 <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" />
533 <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" /> 577 <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" />
534 <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" /> 578 <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" />
535 - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 579 + <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" />
536 <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" /> 580 <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" />
537 <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" /> 581 <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" />
538 <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" /> 582 <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" />
@@ -572,14 +616,6 @@ @@ -572,14 +616,6 @@
572 <watches-manager /> 616 <watches-manager />
573 </component> 617 </component>
574 <component name="editorHistoryManager"> 618 <component name="editorHistoryManager">
575 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb">  
576 - <provider selected="true" editor-type-id="text-editor">  
577 - <state vertical-scroll-proportion="-11.25" vertical-offset="0" max-vertical-offset="450">  
578 - <caret line="18" column="48" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="48" />  
579 - <folding />  
580 - </state>  
581 - </provider>  
582 - </entry>  
583 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/meta.html.erb"> 619 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/meta.html.erb">
584 <provider selected="true" editor-type-id="text-editor"> 620 <provider selected="true" editor-type-id="text-editor">
585 <state vertical-scroll-proportion="-19.375" vertical-offset="45" max-vertical-offset="780"> 621 <state vertical-scroll-proportion="-19.375" vertical-offset="45" max-vertical-offset="780">
@@ -985,8 +1021,8 @@ @@ -985,8 +1021,8 @@
985 </entry> 1021 </entry>
986 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb"> 1022 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
987 <provider selected="true" editor-type-id="text-editor"> 1023 <provider selected="true" editor-type-id="text-editor">
988 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="285">  
989 - <caret line="13" column="140" selection-start-line="13" selection-start-column="50" selection-end-line="13" selection-end-column="140" /> 1024 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1025 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
990 <folding /> 1026 <folding />
991 </state> 1027 </state>
992 </provider> 1028 </provider>
@@ -999,9 +1035,17 @@ @@ -999,9 +1035,17 @@
999 </state> 1035 </state>
1000 </provider> 1036 </provider>
1001 </entry> 1037 </entry>
  1038 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  1039 + <provider selected="true" editor-type-id="text-editor">
  1040 + <state vertical-scroll-proportion="8.333333" vertical-offset="200" max-vertical-offset="810">
  1041 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1042 + <folding />
  1043 + </state>
  1044 + </provider>
  1045 + </entry>
1002 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 1046 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1003 <provider selected="true" editor-type-id="text-editor"> 1047 <provider selected="true" editor-type-id="text-editor">
1004 - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416"> 1048 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
1005 <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" /> 1049 <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" />
1006 <folding /> 1050 <folding />
1007 </state> 1051 </state>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.5) 4 + kanjai (0.0.6)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
1 -# Be sure to restart your server when you modify this file.  
2 -  
3 -# Version of your assets, change this if you want to expire all your assets.  
4 -Rails.application.config.assets.version = '1.0'  
5 -  
6 -# Add additional assets to the asset load path  
7 -# Rails.application.config.assets.paths << Emoji.images_path  
8 -  
9 -# Precompile additional assets.  
10 -# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.  
11 -# Rails.application.config.assets.precompile += %w( search.js )  
12 -  
13 -Rails.application.config.assets.precompile += %w( kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css)  
14 -Rails.application.config.assets.precompile += %w( kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js)  
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.6" 2 + VERSION = "0.0.7"
3 end 3 end