EDIT / kanjai · Commits

Commit 96e55d6625ba7c8cd236e23df4704976881bfa4d

Authored by Karpikau Andrei
1 parent 6144e629

test

Inline Side-by-side
Showing 4 changed files with 115 additions and 81 deletions
@@ -24,16 +24,6 @@ @@ -24,16 +24,6 @@
24 </component> 24 </component>
25 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
26 <leaf> 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">  
29 - <provider selected="true" editor-type-id="text-editor">  
30 - <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="315">  
31 - <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />  
32 - <folding />  
33 - </state>  
34 - </provider>  
35 - </entry>  
36 - </file>  
37 <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false"> 27 <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">
38 <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb"> 28 <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
39 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
@@ -44,16 +34,6 @@ @@ -44,16 +34,6 @@
44 </provider> 34 </provider>
45 </entry> 35 </entry>
46 </file> 36 </file>
47 - <file leaf-file-name="admin_login.html.erb" pinned="false" current-in-tab="false">  
48 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">  
49 - <provider selected="true" editor-type-id="text-editor">  
50 - <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390">  
51 - <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />  
52 - <folding />  
53 - </state>  
54 - </provider>  
55 - </entry>  
56 - </file>  
57 <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false"> 37 <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
58 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb"> 38 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
59 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
@@ -84,41 +64,61 @@ @@ -84,41 +64,61 @@
84 </provider> 64 </provider>
85 </entry> 65 </entry>
86 </file> 66 </file>
87 - <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">  
88 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 67 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  68 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
89 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
90 - <state vertical-scroll-proportion="0.0" vertical-offset="95" max-vertical-offset="810">  
91 - <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" /> 70 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  71 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
92 <folding /> 72 <folding />
93 </state> 73 </state>
94 </provider> 74 </provider>
95 </entry> 75 </entry>
96 </file> 76 </file>
97 - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">  
98 - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 77 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  78 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
99 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
100 - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">  
101 - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 80 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2115">
  81 + <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" />
102 <folding /> 82 <folding />
103 </state> 83 </state>
104 </provider> 84 </provider>
105 </entry> 85 </entry>
106 </file> 86 </file>
107 - <file leaf-file-name="image.rb" pinned="false" current-in-tab="false">  
108 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb"> 87 + <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
  88 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
109 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
110 - <state vertical-scroll-proportion="0.0" vertical-offset="135" max-vertical-offset="390">  
111 - <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> 90 + <state vertical-scroll-proportion="0.0" vertical-offset="551" max-vertical-offset="1185">
  91 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
112 <folding /> 92 <folding />
113 </state> 93 </state>
114 </provider> 94 </provider>
115 </entry> 95 </entry>
116 </file> 96 </file>
117 - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">  
118 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 97 + <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">
  98 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
119 <provider selected="true" editor-type-id="text-editor"> 99 <provider selected="true" editor-type-id="text-editor">
120 - <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">  
121 - <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" /> 100 + <state vertical-scroll-proportion="0.0" vertical-offset="1706" max-vertical-offset="2340">
  101 + <caret line="133" column="23" selection-start-line="133" selection-start-column="23" selection-end-line="133" selection-end-column="23" />
  102 + <folding />
  103 + </state>
  104 + </provider>
  105 + </entry>
  106 + </file>
  107 + <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false">
  108 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
  109 + <provider selected="true" editor-type-id="text-editor">
  110 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  111 + <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
  112 + <folding />
  113 + </state>
  114 + </provider>
  115 + </entry>
  116 + </file>
  117 + <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
  118 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  119 + <provider selected="true" editor-type-id="text-editor">
  120 + <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
  121 + <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
122 <folding /> 122 <folding />
123 </state> 123 </state>
124 </provider> 124 </provider>
@@ -171,7 +171,6 @@ @@ -171,7 +171,6 @@
171 <option value="$PROJECT_DIR$/kanjai.gemspec" /> 171 <option value="$PROJECT_DIR$/kanjai.gemspec" />
172 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" /> 172 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
173 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" /> 173 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
174 - <option value="$PROJECT_DIR$/lib/kanjai.rb" />  
175 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 174 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
176 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" /> 175 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
177 <option value="$PROJECT_DIR$/config/initializers/assets.rb" /> 176 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
@@ -179,6 +178,7 @@ @@ -179,6 +178,7 @@
179 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" /> 178 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
180 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 179 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
181 <option value="$PROJECT_DIR$/config/initializers/devise.rb" /> 180 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
  181 + <option value="$PROJECT_DIR$/lib/kanjai.rb" />
182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 </list> 183 </list>
184 </option> 184 </option>
@@ -347,6 +347,28 @@ @@ -347,6 +347,28 @@
347 <option name="myItemId" value="app" /> 347 <option name="myItemId" value="app" />
348 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 348 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
349 </PATH_ELEMENT> 349 </PATH_ELEMENT>
  350 + <PATH_ELEMENT>
  351 + <option name="myItemId" value="models" />
  352 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  353 + </PATH_ELEMENT>
  354 + <PATH_ELEMENT>
  355 + <option name="myItemId" value="kanjai" />
  356 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  357 + </PATH_ELEMENT>
  358 + </PATH>
  359 + <PATH>
  360 + <PATH_ELEMENT>
  361 + <option name="myItemId" value="kanjai" />
  362 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  363 + </PATH_ELEMENT>
  364 + <PATH_ELEMENT>
  365 + <option name="myItemId" value="kanjai" />
  366 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  367 + </PATH_ELEMENT>
  368 + <PATH_ELEMENT>
  369 + <option name="myItemId" value="app" />
  370 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  371 + </PATH_ELEMENT>
350 </PATH> 372 </PATH>
351 <PATH> 373 <PATH>
352 <PATH_ELEMENT> 374 <PATH_ELEMENT>
@@ -569,7 +591,7 @@ @@ -569,7 +591,7 @@
569 </component> 591 </component>
570 <component name="ToolWindowManager"> 592 <component name="ToolWindowManager">
571 <frame x="0" y="23" width="1280" height="728" extended-state="6" /> 593 <frame x="0" y="23" width="1280" height="728" extended-state="6" />
572 - <editor active="false" /> 594 + <editor active="true" />
573 <layout> 595 <layout>
574 <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" /> 596 <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" />
575 <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" /> 597 <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" />
@@ -578,7 +600,7 @@ @@ -578,7 +600,7 @@
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" /> 600 <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" />
579 <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" /> 601 <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" />
580 <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" /> 602 <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" />
581 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26171243" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 603 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26171243" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
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" /> 604 <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" />
583 <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" /> 605 <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" />
584 <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" /> 606 <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" />
@@ -614,14 +636,6 @@ @@ -614,14 +636,6 @@
614 <watches-manager /> 636 <watches-manager />
615 </component> 637 </component>
616 <component name="editorHistoryManager"> 638 <component name="editorHistoryManager">
617 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/font_awesome_4_4/font-awesome.css.scss.erb">  
618 - <provider selected="true" editor-type-id="text-editor">  
619 - <state vertical-scroll-proportion="-8.125" vertical-offset="0" max-vertical-offset="30600">  
620 - <caret line="13" column="23" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="23" />  
621 - <folding />  
622 - </state>  
623 - </provider>  
624 - </entry>  
625 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/underscore.js"> 639 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/underscore.js">
626 <provider selected="true" editor-type-id="text-editor"> 640 <provider selected="true" editor-type-id="text-editor">
627 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165"> 641 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
@@ -637,14 +651,6 @@ @@ -637,14 +651,6 @@
637 </state> 651 </state>
638 </provider> 652 </provider>
639 </entry> 653 </entry>
640 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">  
641 - <provider selected="true" editor-type-id="text-editor">  
642 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2340">  
643 - <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />  
644 - <folding />  
645 - </state>  
646 - </provider>  
647 - </entry>  
648 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb"> 654 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
649 <provider selected="true" editor-type-id="text-editor"> 655 <provider selected="true" editor-type-id="text-editor">
650 <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615"> 656 <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615">
@@ -771,6 +777,7 @@ @@ -771,6 +777,7 @@
771 <provider selected="true" editor-type-id="text-editor"> 777 <provider selected="true" editor-type-id="text-editor">
772 <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="900"> 778 <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="900">
773 <caret line="20" column="61" selection-start-line="20" selection-start-column="61" selection-end-line="20" selection-end-column="61" /> 779 <caret line="20" column="61" selection-start-line="20" selection-start-column="61" selection-end-line="20" selection-end-column="61" />
  780 + <folding />
774 </state> 781 </state>
775 </provider> 782 </provider>
776 </entry> 783 </entry>
@@ -839,13 +846,6 @@ @@ -839,13 +846,6 @@
839 </state> 846 </state>
840 </provider> 847 </provider>
841 </entry> 848 </entry>
842 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">  
843 - <provider selected="true" editor-type-id="text-editor">  
844 - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">  
845 - <caret line="65" column="0" selection-start-line="65" selection-start-column="0" selection-end-line="65" selection-end-column="0" />  
846 - </state>  
847 - </provider>  
848 - </entry>  
849 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js"> 849 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
850 <provider selected="true" editor-type-id="text-editor"> 850 <provider selected="true" editor-type-id="text-editor">
851 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245"> 851 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">
@@ -914,18 +914,13 @@ @@ -914,18 +914,13 @@
914 </state> 914 </state>
915 </provider> 915 </provider>
916 </entry> 916 </entry>
917 - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">  
918 - <provider selected="true" editor-type-id="text-editor">  
919 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="240">  
920 - <caret line="4" column="14" selection-start-line="4" selection-start-column="14" selection-end-line="4" selection-end-column="14" />  
921 - </state>  
922 - </provider>  
923 - </entry>  
924 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb"> 917 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
925 <provider selected="true" editor-type-id="text-editor"> 918 <provider selected="true" editor-type-id="text-editor">
926 <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390"> 919 <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390">
927 <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" /> 920 <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />
928 - <folding /> 921 + <folding>
  922 + <element signature="n#t('login_title')#0;n#!!top" expanded="false" />
  923 + </folding>
929 </state> 924 </state>
930 </provider> 925 </provider>
931 </entry> 926 </entry>
@@ -933,7 +928,13 @@ @@ -933,7 +928,13 @@
933 <provider selected="true" editor-type-id="text-editor"> 928 <provider selected="true" editor-type-id="text-editor">
934 <state vertical-scroll-proportion="0.0" vertical-offset="95" max-vertical-offset="810"> 929 <state vertical-scroll-proportion="0.0" vertical-offset="95" max-vertical-offset="810">
935 <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" /> 930 <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" />
936 - <folding /> 931 + <folding>
  932 + <element signature="n#t('admin_panel_title')#0;n#!!top" expanded="false" />
  933 + <element signature="e#529#558#0#ruby" expanded="false" />
  934 + <element signature="e#639#660#0#ruby" expanded="false" />
  935 + <element signature="e#733#759#0#ruby" expanded="false" />
  936 + <element signature="e#837#862#0#ruby" expanded="false" />
  937 + </folding>
937 </state> 938 </state>
938 </provider> 939 </provider>
939 </entry> 940 </entry>
@@ -953,14 +954,6 @@ @@ -953,14 +954,6 @@
953 </state> 954 </state>
954 </provider> 955 </provider>
955 </entry> 956 </entry>
956 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">  
957 - <provider selected="true" editor-type-id="text-editor">  
958 - <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">  
959 - <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" />  
960 - <folding />  
961 - </state>  
962 - </provider>  
963 - </entry>  
964 <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb"> 957 <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
965 <provider selected="true" editor-type-id="text-editor"> 958 <provider selected="true" editor-type-id="text-editor">
966 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416"> 959 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
@@ -985,6 +978,46 @@ @@ -985,6 +978,46 @@
985 </state> 978 </state>
986 </provider> 979 </provider>
987 </entry> 980 </entry>
  981 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  982 + <provider selected="true" editor-type-id="text-editor">
  983 + <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">
  984 + <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" />
  985 + <folding />
  986 + </state>
  987 + </provider>
  988 + </entry>
  989 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  990 + <provider selected="true" editor-type-id="text-editor">
  991 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1185">
  992 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  993 + <folding />
  994 + </state>
  995 + </provider>
  996 + </entry>
  997 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  998 + <provider selected="true" editor-type-id="text-editor">
  999 + <state vertical-scroll-proportion="0.0" vertical-offset="1706" max-vertical-offset="2340">
  1000 + <caret line="133" column="23" selection-start-line="133" selection-start-column="23" selection-end-line="133" selection-end-column="23" />
  1001 + <folding />
  1002 + </state>
  1003 + </provider>
  1004 + </entry>
  1005 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  1006 + <provider selected="true" editor-type-id="text-editor">
  1007 + <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
  1008 + <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
  1009 + <folding />
  1010 + </state>
  1011 + </provider>
  1012 + </entry>
  1013 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
  1014 + <provider selected="true" editor-type-id="text-editor">
  1015 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  1016 + <caret line="5" column="30" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
  1017 + <folding />
  1018 + </state>
  1019 + </provider>
  1020 + </entry>
988 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 1021 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
989 <provider selected="true" editor-type-id="text-editor"> 1022 <provider selected="true" editor-type-id="text-editor">
990 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 1023 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.11) 4 + kanjai (0.0.12)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -3,6 +3,7 @@ require "devise" @@ -3,6 +3,7 @@ require "devise"
3 require "aws-sdk" 3 require "aws-sdk"
4 require "delayed_job_active_record" 4 require "delayed_job_active_record"
5 require "rails" 5 require "rails"
  6 +require "backport_new_renderer"
6 require "kanjai/engine" 7 require "kanjai/engine"
7 8
8 module Kanjai 9 module Kanjai
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.12" 2 + VERSION = "0.0.13"
3 end 3 end