EDIT / kanjai · Commits

Commit 465a94dac8a06ee8f96902e15f15e6b4cd43d346

Authored by Karpikau Andrei
1 parent 0c825813

check authentificate token

Inline Side-by-side
Showing 4 changed files with 88 additions and 91 deletions
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true"> 38 <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
39 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 39 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
40 <provider selected="true" editor-type-id="text-editor"> 40 <provider selected="true" editor-type-id="text-editor">
41 - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 41 + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
42 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 42 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
43 <folding /> 43 <folding />
44 </state> 44 </state>
@@ -48,20 +48,8 @@ @@ -48,20 +48,8 @@
48 <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false"> 48 <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
49 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb"> 49 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">
50 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
51 - <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="300"> 51 + <state vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="300">
52 <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" /> 52 <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />
53 - <folding>  
54 - <element signature="n#t('admin.admin_users.edit')#0;n#!!top" expanded="false" />  
55 - </folding>  
56 - </state>  
57 - </provider>  
58 - </entry>  
59 - </file>  
60 - <file leaf-file-name="en.yml" pinned="false" current-in-tab="false">  
61 - <entry file="file://$PROJECT_DIR$/config/locales/en.yml">  
62 - <provider selected="true" editor-type-id="text-editor">  
63 - <state vertical-scroll-proportion="0.0" vertical-offset="1091" max-vertical-offset="1950">  
64 - <caret line="91" column="28" selection-start-line="91" selection-start-column="28" selection-end-line="91" selection-end-column="28" />  
65 <folding /> 53 <folding />
66 </state> 54 </state>
67 </provider> 55 </provider>
@@ -80,48 +68,58 @@ @@ -80,48 +68,58 @@
80 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 68 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
81 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 69 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
82 <provider selected="true" editor-type-id="text-editor"> 70 <provider selected="true" editor-type-id="text-editor">
83 - <state vertical-scroll-proportion="-13.592592" vertical-offset="413" max-vertical-offset="3090">  
84 - <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" /> 71 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3090">
  72 + <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
85 <folding /> 73 <folding />
86 </state> 74 </state>
87 </provider> 75 </provider>
88 </entry> 76 </entry>
89 </file> 77 </file>
90 - <file leaf-file-name="application_helper.rb" pinned="false" current-in-tab="false">  
91 - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb"> 78 + <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
92 <provider selected="true" editor-type-id="text-editor"> 80 <provider selected="true" editor-type-id="text-editor">
93 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">  
94 - <caret line="11" column="7" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" /> 81 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  82 + <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
95 <folding /> 83 <folding />
96 </state> 84 </state>
97 </provider> 85 </provider>
98 </entry> 86 </entry>
99 </file> 87 </file>
100 - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">  
101 - <entry file="file://$PROJECT_DIR$/Gemfile"> 88 + <file leaf-file-name="admin_controller.rb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
102 <provider selected="true" editor-type-id="text-editor"> 90 <provider selected="true" editor-type-id="text-editor">
103 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">  
104 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 91 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
  92 + <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
105 <folding /> 93 <folding />
106 </state> 94 </state>
107 </provider> 95 </provider>
108 </entry> 96 </entry>
109 </file> 97 </file>
110 - <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">  
111 - <entry file="file://$PROJECT_DIR$/Gemfile.lock"> 98 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
112 <provider selected="true" editor-type-id="text-editor"> 100 <provider selected="true" editor-type-id="text-editor">
113 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3330">  
114 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 101 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1050">
  102 + <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
115 <folding /> 103 <folding />
116 </state> 104 </state>
117 </provider> 105 </provider>
118 </entry> 106 </entry>
119 </file> 107 </file>
120 - <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">  
121 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 108 + <file leaf-file-name="application_helper.rb" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
122 <provider selected="true" editor-type-id="text-editor"> 110 <provider selected="true" editor-type-id="text-editor">
123 - <state vertical-scroll-proportion="0.0" vertical-offset="870" max-vertical-offset="1125">  
124 - <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" /> 111 + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="1215">
  112 + <caret line="11" column="7" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
  113 + <folding />
  114 + </state>
  115 + </provider>
  116 + </entry>
  117 + </file>
  118 + <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
  120 + <provider selected="true" editor-type-id="text-editor">
  121 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3330">
  122 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
125 <folding /> 123 <folding />
126 </state> 124 </state>
127 </provider> 125 </provider>
@@ -135,7 +133,6 @@ @@ -135,7 +133,6 @@
135 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" /> 133 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />
136 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" /> 134 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
137 <option value="$PROJECT_DIR$/lib/tasks/install.rake" /> 135 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
138 - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />  
139 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" /> 136 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
140 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" /> 137 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
141 <option value="$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb" /> 138 <option value="$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb" />
@@ -172,7 +169,6 @@ @@ -172,7 +169,6 @@
172 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" /> 169 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
173 <option value="$PROJECT_DIR$/lib/zip.rb" /> 170 <option value="$PROJECT_DIR$/lib/zip.rb" />
174 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" /> 171 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
175 - <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />  
176 <option value="$PROJECT_DIR$/config/routes.rb" /> 172 <option value="$PROJECT_DIR$/config/routes.rb" />
177 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" /> 173 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
178 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb" /> 174 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb" />
@@ -182,6 +178,8 @@ @@ -182,6 +178,8 @@
182 <option value="$PROJECT_DIR$/config/locales/en.yml" /> 178 <option value="$PROJECT_DIR$/config/locales/en.yml" />
183 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb" /> 179 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb" />
184 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 180 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  181 + <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
  182 + <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
185 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 183 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
186 </list> 184 </list>
187 </option> 185 </option>
@@ -675,22 +673,22 @@ @@ -675,22 +673,22 @@
675 <layout> 673 <layout>
676 <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" /> 674 <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" />
677 <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" /> 675 <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" />
678 - <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" />  
679 <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" /> 676 <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" />
680 - <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" />  
681 - <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" />  
682 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32390952" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
683 - <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" /> 677 + <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" />
  678 + <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" />
684 <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" /> 679 <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" />
  680 + <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" />
685 <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" /> 681 <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" />
  682 + <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" />
  683 + <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" />
  684 + <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" />
  685 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32875606" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  686 + <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" />
686 <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" /> 687 <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" />
687 <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" /> 688 <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" />
688 - <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" />  
689 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 689 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
690 - <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" />  
691 <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" /> 690 <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" />
692 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 691 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
693 - <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" />  
694 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 692 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
695 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> 693 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
696 </layout> 694 </layout>
@@ -718,13 +716,6 @@ @@ -718,13 +716,6 @@
718 <watches-manager /> 716 <watches-manager />
719 </component> 717 </component>
720 <component name="editorHistoryManager"> 718 <component name="editorHistoryManager">
721 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">  
722 - <provider selected="true" editor-type-id="text-editor">  
723 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
724 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
725 - </state>  
726 - </provider>  
727 - </entry>  
728 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb"> 719 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
729 <provider selected="true" editor-type-id="text-editor"> 720 <provider selected="true" editor-type-id="text-editor">
730 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 721 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -907,13 +898,6 @@ @@ -907,13 +898,6 @@
907 </state> 898 </state>
908 </provider> 899 </provider>
909 </entry> 900 </entry>
910 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">  
911 - <provider selected="true" editor-type-id="text-editor">  
912 - <state vertical-scroll-proportion="-18.88889" vertical-offset="0" max-vertical-offset="1050">  
913 - <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />  
914 - </state>  
915 - </provider>  
916 - </entry>  
917 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/application.css"> 901 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/application.css">
918 <provider selected="true" editor-type-id="text-editor"> 902 <provider selected="true" editor-type-id="text-editor">
919 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 903 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -928,14 +912,6 @@ @@ -928,14 +912,6 @@
928 </state> 912 </state>
929 </provider> 913 </provider>
930 </entry> 914 </entry>
931 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">  
932 - <provider selected="true" editor-type-id="text-editor">  
933 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">  
934 - <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />  
935 - <folding />  
936 - </state>  
937 - </provider>  
938 - </entry>  
939 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb"> 915 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb">
940 <provider selected="true" editor-type-id="text-editor"> 916 <provider selected="true" editor-type-id="text-editor">
941 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360"> 917 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
@@ -999,14 +975,6 @@ @@ -999,14 +975,6 @@
999 </state> 975 </state>
1000 </provider> 976 </provider>
1001 </entry> 977 </entry>
1002 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb">  
1003 - <provider selected="true" editor-type-id="text-editor">  
1004 - <state vertical-scroll-proportion="0.0" vertical-offset="176" max-vertical-offset="810">  
1005 - <caret line="40" column="7" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />  
1006 - <folding />  
1007 - </state>  
1008 - </provider>  
1009 - </entry>  
1010 <entry file="file://$PROJECT_DIR$/config/locales/en.yml"> 978 <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
1011 <provider selected="true" editor-type-id="text-editor"> 979 <provider selected="true" editor-type-id="text-editor">
1012 <state vertical-scroll-proportion="0.0" vertical-offset="1091" max-vertical-offset="1950"> 980 <state vertical-scroll-proportion="0.0" vertical-offset="1091" max-vertical-offset="1950">
@@ -1015,16 +983,6 @@ @@ -1015,16 +983,6 @@
1015 </state> 983 </state>
1016 </provider> 984 </provider>
1017 </entry> 985 </entry>
1018 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">  
1019 - <provider selected="true" editor-type-id="text-editor">  
1020 - <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="300">  
1021 - <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />  
1022 - <folding>  
1023 - <element signature="n#t('admin.admin_users.edit')#0;n#!!top" expanded="false" />  
1024 - </folding>  
1025 - </state>  
1026 - </provider>  
1027 - </entry>  
1028 <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 986 <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
1029 <provider selected="true" editor-type-id="text-editor"> 987 <provider selected="true" editor-type-id="text-editor">
1030 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1125"> 988 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1125">
@@ -1053,6 +1011,29 @@ @@ -1053,6 +1011,29 @@
1053 <provider selected="true" editor-type-id="text-editor"> 1011 <provider selected="true" editor-type-id="text-editor">
1054 <state vertical-scroll-proportion="4.542587" vertical-offset="0" max-vertical-offset="4635"> 1012 <state vertical-scroll-proportion="4.542587" vertical-offset="0" max-vertical-offset="4635">
1055 <caret line="192" column="0" selection-start-line="192" selection-start-column="0" selection-end-line="192" selection-end-column="0" /> 1013 <caret line="192" column="0" selection-start-line="192" selection-start-column="0" selection-end-line="192" selection-end-column="0" />
  1014 + </state>
  1015 + </provider>
  1016 + </entry>
  1017 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  1018 + <provider selected="true" editor-type-id="text-editor">
  1019 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
  1020 + <caret line="11" column="7" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
  1021 + <folding />
  1022 + </state>
  1023 + </provider>
  1024 + </entry>
  1025 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb">
  1026 + <provider selected="true" editor-type-id="text-editor">
  1027 + <state vertical-scroll-proportion="0.0" vertical-offset="176" max-vertical-offset="810">
  1028 + <caret line="40" column="7" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
  1029 + <folding />
  1030 + </state>
  1031 + </provider>
  1032 + </entry>
  1033 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">
  1034 + <provider selected="true" editor-type-id="text-editor">
  1035 + <state vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="300">
  1036 + <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />
1056 <folding /> 1037 <folding />
1057 </state> 1038 </state>
1058 </provider> 1039 </provider>
@@ -1065,25 +1046,41 @@ @@ -1065,25 +1046,41 @@
1065 </state> 1046 </state>
1066 </provider> 1047 </provider>
1067 </entry> 1048 </entry>
1068 - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb"> 1049 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
1069 <provider selected="true" editor-type-id="text-editor"> 1050 <provider selected="true" editor-type-id="text-editor">
1070 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">  
1071 - <caret line="11" column="7" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" /> 1051 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  1052 + <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
1072 <folding /> 1053 <folding />
1073 </state> 1054 </state>
1074 </provider> 1055 </provider>
1075 </entry> 1056 </entry>
1076 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 1057 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1077 <provider selected="true" editor-type-id="text-editor"> 1058 <provider selected="true" editor-type-id="text-editor">
1078 - <state vertical-scroll-proportion="-13.592592" vertical-offset="413" max-vertical-offset="3090">  
1079 - <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" /> 1059 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3090">
  1060 + <caret line="6" column="0" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
  1061 + <folding />
  1062 + </state>
  1063 + </provider>
  1064 + </entry>
  1065 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  1066 + <provider selected="true" editor-type-id="text-editor">
  1067 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
  1068 + <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
  1069 + <folding />
  1070 + </state>
  1071 + </provider>
  1072 + </entry>
  1073 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1074 + <provider selected="true" editor-type-id="text-editor">
  1075 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1050">
  1076 + <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
1080 <folding /> 1077 <folding />
1081 </state> 1078 </state>
1082 </provider> 1079 </provider>
1083 </entry> 1080 </entry>
1084 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 1081 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1085 <provider selected="true" editor-type-id="text-editor"> 1082 <provider selected="true" editor-type-id="text-editor">
1086 - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 1083 + <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416">
1087 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 1084 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
1088 <folding /> 1085 <folding />
1089 </state> 1086 </state>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.69) 4 + kanjai (0.0.70)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -2,7 +2,7 @@ module Kanjai @@ -2,7 +2,7 @@ module Kanjai
2 class SiteController < ApplicationController 2 class SiteController < ApplicationController
3 layout false 3 layout false
4 4
5 - protect_from_forgery 5 + #protect_from_forgery
6 6
7 before_filter :define_locale 7 before_filter :define_locale
8 before_filter :get_page 8 before_filter :get_page
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.70" 2 + VERSION = "0.0.71"
3 end 3 end