EDIT / kanjai · Commits

Commit c4e4e2c3a8e562d7706ac7b17dd68dffa6aa507f

Authored by Karpikau Andrei
1 parent 0663dbee

change version

Inline Side-by-side
Showing 5 changed files with 87 additions and 186 deletions
@@ -134,11 +134,11 @@ @@ -134,11 +134,11 @@
134 <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.6, rbenv: 2.1.3) [gem]" level="application" /> 134 <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
135 <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.6, rbenv: 2.1.3) [gem]" level="application" /> 135 <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.2, rbenv: 2.1.3) [gem]" level="application" /> 136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.2, rbenv: 2.1.3) [gem]" level="application" />
137 - <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.5.1, rbenv: 2.1.3) [gem]" level="application" /> 137 + <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.6.0, rbenv: 2.1.3) [gem]" level="application" />
138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" /> 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.5, rbenv: 2.1.3) [gem]" level="application" />  
140 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.5, rbenv: 2.1.3) [gem]" level="application" />  
141 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.5, rbenv: 2.1.3) [gem]" level="application" /> 139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.18, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.18, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.18, rbenv: 2.1.3) [gem]" level="application" />
142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> 143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" /> 144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
@@ -181,7 +181,7 @@ @@ -181,7 +181,7 @@
181 <orderEntry type="library" scope="PROVIDED" name="rails_stdout_logging (v0.0.5, rbenv: 2.1.3) [gem]" level="application" /> 181 <orderEntry type="library" scope="PROVIDED" name="rails_stdout_logging (v0.0.5, rbenv: 2.1.3) [gem]" level="application" />
182 <orderEntry type="library" scope="PROVIDED" name="railties (v4.2.6, rbenv: 2.1.3) [gem]" level="application" /> 182 <orderEntry type="library" scope="PROVIDED" name="railties (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
183 <orderEntry type="library" scope="PROVIDED" name="rake (v11.1.2, rbenv: 2.1.3) [gem]" level="application" /> 183 <orderEntry type="library" scope="PROVIDED" name="rake (v11.1.2, rbenv: 2.1.3) [gem]" level="application" />
184 - <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.2.2, rbenv: 2.1.3) [gem]" level="application" /> 184 + <orderEntry type="library" scope="PROVIDED" name="rdoc (v4.3.0, rbenv: 2.1.3) [gem]" level="application" />
185 <orderEntry type="library" scope="PROVIDED" name="ref (v2.0.0, rbenv: 2.1.3) [gem]" level="application" /> 185 <orderEntry type="library" scope="PROVIDED" name="ref (v2.0.0, rbenv: 2.1.3) [gem]" level="application" />
186 <orderEntry type="library" scope="PROVIDED" name="responders (v2.3.0, rbenv: 2.1.3) [gem]" level="application" /> 186 <orderEntry type="library" scope="PROVIDED" name="responders (v2.3.0, rbenv: 2.1.3) [gem]" level="application" />
187 <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.4.4, rbenv: 2.1.3) [gem]" level="application" /> 187 <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.4.4, rbenv: 2.1.3) [gem]" level="application" />
@@ -191,7 +191,7 @@ @@ -191,7 +191,7 @@
191 <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.1, rbenv: 2.1.3) [gem]" level="application" /> 191 <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
192 <orderEntry type="library" scope="PROVIDED" name="sass (v3.4.22, rbenv: 2.1.3) [gem]" level="application" /> 192 <orderEntry type="library" scope="PROVIDED" name="sass (v3.4.22, rbenv: 2.1.3) [gem]" level="application" />
193 <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.6, rbenv: 2.1.3) [gem]" level="application" /> 193 <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.6, rbenv: 2.1.3) [gem]" level="application" />
194 - <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.1, rbenv: 2.1.3) [gem]" level="application" /> 194 + <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.2, rbenv: 2.1.3) [gem]" level="application" />
195 <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.0, rbenv: 2.1.3) [gem]" level="application" /> 195 <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.0, rbenv: 2.1.3) [gem]" level="application" />
196 <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.0, rbenv: 2.1.3) [gem]" level="application" /> 196 <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.2.0, rbenv: 2.1.3) [gem]" level="application" />
197 <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, rbenv: 2.1.3) [gem]" level="application" /> 197 <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, rbenv: 2.1.3) [gem]" level="application" />
@@ -199,7 +199,7 @@ @@ -199,7 +199,7 @@
199 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" /> 199 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" />
200 <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.5, rbenv: 2.1.3) [gem]" level="application" /> 200 <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.5, rbenv: 2.1.3) [gem]" level="application" />
201 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" /> 201 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" />
202 - <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.2, rbenv: 2.1.3) [gem]" level="application" /> 202 + <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.3, rbenv: 2.1.3) [gem]" level="application" />
203 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.6, rbenv: 2.1.3) [gem]" level="application" /> 203 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.6, rbenv: 2.1.3) [gem]" level="application" />
204 </component> 204 </component>
205 <component name="RModuleSettingsStorage"> 205 <component name="RModuleSettingsStorage">
@@ -25,71 +25,11 @@ @@ -25,71 +25,11 @@
25 </component> 25 </component>
26 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
27 <leaf> 27 <leaf>
28 - <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/config/routes.rb">  
30 - <provider selected="true" editor-type-id="text-editor">  
31 - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="960">  
32 - <caret line="5" column="76" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="76" />  
33 - <folding />  
34 - </state>  
35 - </provider>  
36 - </entry>  
37 - </file>  
38 - <file leaf-file-name="sessions_controller.rb" pinned="false" current-in-tab="false">  
39 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb">  
40 - <provider selected="true" editor-type-id="text-editor">  
41 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">  
42 - <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="33" />  
43 - <folding />  
44 - </state>  
45 - </provider>  
46 - </entry>  
47 - </file>  
48 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 28 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
49 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 29 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
50 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
51 - <state vertical-scroll-proportion="15.851851" vertical-offset="1388" max-vertical-offset="2805">  
52 - <caret line="64" column="26" selection-start-line="64" selection-start-column="8" selection-end-line="64" selection-end-column="26" />  
53 - <folding />  
54 - </state>  
55 - </provider>  
56 - </entry>  
57 - </file>  
58 - <file leaf-file-name="show.pdf.erb" pinned="false" current-in-tab="false">  
59 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">  
60 - <provider selected="true" editor-type-id="text-editor">  
61 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">  
62 - <caret line="0" column="11" selection-start-line="0" selection-start-column="11" selection-end-line="0" selection-end-column="11" />  
63 - <folding />  
64 - </state>  
65 - </provider>  
66 - </entry>  
67 - </file>  
68 - <file leaf-file-name="template_parser.rb" pinned="false" current-in-tab="false">  
69 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">  
70 - <provider selected="true" editor-type-id="text-editor">  
71 - <state vertical-scroll-proportion="0.0" vertical-offset="1643" max-vertical-offset="2250">  
72 - <caret line="97" column="8" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />  
73 - <folding />  
74 - </state>  
75 - </provider>  
76 - </entry>  
77 - </file>  
78 - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">  
79 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">  
80 - <provider selected="true" editor-type-id="text-editor">  
81 - <state vertical-scroll-proportion="0.0" vertical-offset="3450" max-vertical-offset="4635">  
82 - <caret line="230" column="55" selection-start-line="230" selection-start-column="30" selection-end-line="230" selection-end-column="55" />  
83 - <folding />  
84 - </state>  
85 - </provider>  
86 - </entry>  
87 - </file>  
88 - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">  
89 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">  
90 - <provider selected="true" editor-type-id="text-editor">  
91 - <state vertical-scroll-proportion="0.0" vertical-offset="342" max-vertical-offset="1050">  
92 - <caret line="33" column="22" selection-start-line="33" selection-start-column="6" selection-end-line="33" selection-end-column="22" /> 31 + <state vertical-scroll-proportion="-6.4444447" vertical-offset="1896" max-vertical-offset="2805">
  32 + <caret line="138" column="80" selection-start-line="138" selection-start-column="80" selection-end-line="138" selection-end-column="80" />
93 <folding /> 33 <folding />
94 </state> 34 </state>
95 </provider> 35 </provider>
@@ -98,36 +38,13 @@ @@ -98,36 +38,13 @@
98 <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">
99 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 39 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
100 <provider selected="true" editor-type-id="text-editor"> 40 <provider selected="true" editor-type-id="text-editor">
101 - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416"> 41 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
102 <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" />
103 <folding /> 43 <folding />
104 </state> 44 </state>
105 </provider> 45 </provider>
106 </entry> 46 </entry>
107 </file> 47 </file>
108 - <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">  
109 - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">  
110 - <provider selected="true" editor-type-id="text-editor">  
111 - <state vertical-scroll-proportion="0.0" vertical-offset="2127" max-vertical-offset="2925">  
112 - <caret line="151" column="70" selection-start-line="151" selection-start-column="70" selection-end-line="151" selection-end-column="70" />  
113 - <folding />  
114 - </state>  
115 - </provider>  
116 - </entry>  
117 - </file>  
118 - <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">  
119 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb">  
120 - <provider selected="true" editor-type-id="text-editor">  
121 - <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="450">  
122 - <caret line="13" column="74" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="74" />  
123 - <folding>  
124 - <element signature="n#t('admin.pages.page_title')#0;n#!!top" expanded="false" />  
125 - <element signature="e#114#138#0#ruby" expanded="false" />  
126 - </folding>  
127 - </state>  
128 - </provider>  
129 - </entry>  
130 - </file>  
131 </leaf> 48 </leaf>
132 </component> 49 </component>
133 <component name="IdeDocumentHistory"> 50 <component name="IdeDocumentHistory">
@@ -177,12 +94,12 @@ @@ -177,12 +94,12 @@
177 <option value="$PROJECT_DIR$/kanjai.gemspec" /> 94 <option value="$PROJECT_DIR$/kanjai.gemspec" />
178 <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" /> 95 <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" />
179 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" /> 96 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" />
180 - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />  
181 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" /> 97 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
182 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" /> 98 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
183 <option value="$PROJECT_DIR$/lib/zip.rb" /> 99 <option value="$PROJECT_DIR$/lib/zip.rb" />
184 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" /> 100 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
185 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 101 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  102 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
186 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 103 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
187 </list> 104 </list>
188 </option> 105 </option>
@@ -218,7 +135,6 @@ @@ -218,7 +135,6 @@
218 <sortByType /> 135 <sortByType />
219 </navigator> 136 </navigator>
220 <panes> 137 <panes>
221 - <pane id="RailsProjectView" />  
222 <pane id="ProjectPane"> 138 <pane id="ProjectPane">
223 <subPane> 139 <subPane>
224 <PATH> 140 <PATH>
@@ -282,6 +198,10 @@ @@ -282,6 +198,10 @@
282 <option name="myItemId" value="app" /> 198 <option name="myItemId" value="app" />
283 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 199 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
284 </PATH_ELEMENT> 200 </PATH_ELEMENT>
  201 + <PATH_ELEMENT>
  202 + <option name="myItemId" value="views" />
  203 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  204 + </PATH_ELEMENT>
285 </PATH> 205 </PATH>
286 <PATH> 206 <PATH>
287 <PATH_ELEMENT> 207 <PATH_ELEMENT>
@@ -296,14 +216,6 @@ @@ -296,14 +216,6 @@
296 <option name="myItemId" value="app" /> 216 <option name="myItemId" value="app" />
297 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 217 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
298 </PATH_ELEMENT> 218 </PATH_ELEMENT>
299 - <PATH_ELEMENT>  
300 - <option name="myItemId" value="controllers" />  
301 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
302 - </PATH_ELEMENT>  
303 - <PATH_ELEMENT>  
304 - <option name="myItemId" value="kanjai" />  
305 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
306 - </PATH_ELEMENT>  
307 </PATH> 219 </PATH>
308 <PATH> 220 <PATH>
309 <PATH_ELEMENT> 221 <PATH_ELEMENT>
@@ -326,10 +238,6 @@ @@ -326,10 +238,6 @@
326 <option name="myItemId" value="kanjai" /> 238 <option name="myItemId" value="kanjai" />
327 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 239 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
328 </PATH_ELEMENT> 240 </PATH_ELEMENT>
329 - <PATH_ELEMENT>  
330 - <option name="myItemId" value="admin" />  
331 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
332 - </PATH_ELEMENT>  
333 </PATH> 241 </PATH>
334 <PATH> 242 <PATH>
335 <PATH_ELEMENT> 243 <PATH_ELEMENT>
@@ -351,6 +259,7 @@ @@ -351,6 +259,7 @@
351 </PATH> 259 </PATH>
352 </subPane> 260 </subPane>
353 </pane> 261 </pane>
  262 + <pane id="RailsProjectView" />
354 <pane id="Scope" /> 263 <pane id="Scope" />
355 </panes> 264 </panes>
356 </component> 265 </component>
@@ -545,7 +454,7 @@ @@ -545,7 +454,7 @@
545 <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" /> 454 <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" />
546 <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" /> 455 <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" />
547 <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" /> 456 <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" />
548 - <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" /> 457 + <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" />
549 <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" /> 458 <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" />
550 <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" /> 459 <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" />
551 <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" /> 460 <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" />
@@ -553,7 +462,7 @@ @@ -553,7 +462,7 @@
553 <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" /> 462 <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" />
554 <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" /> 463 <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" />
555 <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" /> 464 <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" />
556 - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.40791598" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> 465 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.43376413" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
557 <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" /> 466 <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" />
558 <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" /> 467 <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" />
559 <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" /> 468 <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" />
@@ -587,34 +496,6 @@ @@ -587,34 +496,6 @@
587 <watches-manager /> 496 <watches-manager />
588 </component> 497 </component>
589 <component name="editorHistoryManager"> 498 <component name="editorHistoryManager">
590 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/bootstrap.js">  
591 - <provider selected="true" editor-type-id="text-editor">  
592 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="34905">  
593 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
594 - </state>  
595 - </provider>  
596 - </entry>  
597 - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">  
598 - <provider selected="true" editor-type-id="text-editor">  
599 - <state vertical-scroll-proportion="0.0" vertical-offset="1366" max-vertical-offset="3420">  
600 - <caret line="103" column="30" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="30" />  
601 - </state>  
602 - </provider>  
603 - </entry>  
604 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">  
605 - <provider selected="true" editor-type-id="text-editor">  
606 - <state vertical-scroll-proportion="0.0" vertical-offset="585" max-vertical-offset="1380">  
607 - <caret line="56" column="10" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" />  
608 - </state>  
609 - </provider>  
610 - </entry>  
611 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">  
612 - <provider selected="true" editor-type-id="text-editor">  
613 - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="675">  
614 - <caret line="5" column="132" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="132" />  
615 - </state>  
616 - </provider>  
617 - </entry>  
618 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb"> 499 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
619 <provider selected="true" editor-type-id="text-editor"> 500 <provider selected="true" editor-type-id="text-editor">
620 <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="615"> 501 <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="615">
@@ -699,13 +580,6 @@ @@ -699,13 +580,6 @@
699 </state> 580 </state>
700 </provider> 581 </provider>
701 </entry> 582 </entry>
702 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">  
703 - <provider selected="true" editor-type-id="text-editor">  
704 - <state vertical-scroll-proportion="0.26025236" vertical-offset="0" max-vertical-offset="634">  
705 - <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />  
706 - </state>  
707 - </provider>  
708 - </entry>  
709 <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb"> 583 <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
710 <provider selected="true" editor-type-id="text-editor"> 584 <provider selected="true" editor-type-id="text-editor">
711 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 585 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -844,7 +718,6 @@ @@ -844,7 +718,6 @@
844 <provider selected="true" editor-type-id="text-editor"> 718 <provider selected="true" editor-type-id="text-editor">
845 <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="1125"> 719 <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="1125">
846 <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" /> 720 <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
847 - <folding />  
848 </state> 721 </state>
849 </provider> 722 </provider>
850 </entry> 723 </entry>
@@ -852,7 +725,6 @@ @@ -852,7 +725,6 @@
852 <provider selected="true" editor-type-id="text-editor"> 725 <provider selected="true" editor-type-id="text-editor">
853 <state vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="615"> 726 <state vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="615">
854 <caret line="3" column="173" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="173" /> 727 <caret line="3" column="173" selection-start-line="3" selection-start-column="4" selection-end-line="3" selection-end-column="173" />
855 - <folding />  
856 </state> 728 </state>
857 </provider> 729 </provider>
858 </entry> 730 </entry>
@@ -860,7 +732,6 @@ @@ -860,7 +732,6 @@
860 <provider selected="true" editor-type-id="text-editor"> 732 <provider selected="true" editor-type-id="text-editor">
861 <state vertical-scroll-proportion="0.0" vertical-offset="2514" max-vertical-offset="4635"> 733 <state vertical-scroll-proportion="0.0" vertical-offset="2514" max-vertical-offset="4635">
862 <caret line="191" column="35" selection-start-line="182" selection-start-column="0" selection-end-line="191" selection-end-column="35" /> 734 <caret line="191" column="35" selection-start-line="182" selection-start-column="0" selection-end-line="191" selection-end-column="35" />
863 - <folding />  
864 </state> 735 </state>
865 </provider> 736 </provider>
866 </entry> 737 </entry>
@@ -868,7 +739,6 @@ @@ -868,7 +739,6 @@
868 <provider selected="true" editor-type-id="text-editor"> 739 <provider selected="true" editor-type-id="text-editor">
869 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 740 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
870 <caret line="0" column="51" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="74" /> 741 <caret line="0" column="51" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="74" />
871 - <folding />  
872 </state> 742 </state>
873 </provider> 743 </provider>
874 </entry> 744 </entry>
@@ -876,7 +746,6 @@ @@ -876,7 +746,6 @@
876 <provider selected="true" editor-type-id="text-editor"> 746 <provider selected="true" editor-type-id="text-editor">
877 <state vertical-scroll-proportion="0.0" vertical-offset="1643" max-vertical-offset="2250"> 747 <state vertical-scroll-proportion="0.0" vertical-offset="1643" max-vertical-offset="2250">
878 <caret line="97" column="8" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" /> 748 <caret line="97" column="8" selection-start-line="97" selection-start-column="8" selection-end-line="97" selection-end-column="23" />
879 - <folding />  
880 </state> 749 </state>
881 </provider> 750 </provider>
882 </entry> 751 </entry>
@@ -884,7 +753,6 @@ @@ -884,7 +753,6 @@
884 <provider selected="true" editor-type-id="text-editor"> 753 <provider selected="true" editor-type-id="text-editor">
885 <state vertical-scroll-proportion="0.0" vertical-offset="2127" max-vertical-offset="2925"> 754 <state vertical-scroll-proportion="0.0" vertical-offset="2127" max-vertical-offset="2925">
886 <caret line="151" column="70" selection-start-line="151" selection-start-column="70" selection-end-line="151" selection-end-column="70" /> 755 <caret line="151" column="70" selection-start-line="151" selection-start-column="70" selection-end-line="151" selection-end-column="70" />
887 - <folding />  
888 </state> 756 </state>
889 </provider> 757 </provider>
890 </entry> 758 </entry>
@@ -892,10 +760,6 @@ @@ -892,10 +760,6 @@
892 <provider selected="true" editor-type-id="text-editor"> 760 <provider selected="true" editor-type-id="text-editor">
893 <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="450"> 761 <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="450">
894 <caret line="13" column="74" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="74" /> 762 <caret line="13" column="74" selection-start-line="13" selection-start-column="54" selection-end-line="13" selection-end-column="74" />
895 - <folding>  
896 - <element signature="n#t('admin.pages.page_title')#0;n#!!top" expanded="false" />  
897 - <element signature="e#114#138#0#ruby" expanded="false" />  
898 - </folding>  
899 </state> 763 </state>
900 </provider> 764 </provider>
901 </entry> 765 </entry>
@@ -907,14 +771,6 @@ @@ -907,14 +771,6 @@
907 </state> 771 </state>
908 </provider> 772 </provider>
909 </entry> 773 </entry>
910 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb">  
911 - <provider selected="true" editor-type-id="text-editor">  
912 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">  
913 - <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="33" />  
914 - <folding />  
915 - </state>  
916 - </provider>  
917 - </entry>  
918 <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb"> 774 <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
919 <provider selected="true" editor-type-id="text-editor"> 775 <provider selected="true" editor-type-id="text-editor">
920 <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90"> 776 <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
@@ -927,37 +783,83 @@ @@ -927,37 +783,83 @@
927 <provider selected="true" editor-type-id="text-editor"> 783 <provider selected="true" editor-type-id="text-editor">
928 <state vertical-scroll-proportion="0.14195584" vertical-offset="0" max-vertical-offset="2520"> 784 <state vertical-scroll-proportion="0.14195584" vertical-offset="0" max-vertical-offset="2520">
929 <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" /> 785 <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
930 - <folding />  
931 </state> 786 </state>
932 </provider> 787 </provider>
933 </entry> 788 </entry>
934 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 789 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
935 <provider selected="true" editor-type-id="text-editor"> 790 <provider selected="true" editor-type-id="text-editor">
936 - <state vertical-scroll-proportion="15.851851" vertical-offset="1388" max-vertical-offset="2805">  
937 - <caret line="64" column="26" selection-start-line="64" selection-start-column="8" selection-end-line="64" selection-end-column="26" /> 791 + <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">
  792 + <caret line="230" column="55" selection-start-line="230" selection-start-column="30" selection-end-line="230" selection-end-column="55" />
938 <folding /> 793 <folding />
939 </state> 794 </state>
940 </provider> 795 </provider>
941 </entry> 796 </entry>
942 - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb"> 797 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
943 <provider selected="true" editor-type-id="text-editor"> 798 <provider selected="true" editor-type-id="text-editor">
944 - <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">  
945 - <caret line="230" column="55" selection-start-line="230" selection-start-column="30" selection-end-line="230" selection-end-column="55" /> 799 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  800 + <caret line="0" column="46" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="46" />
  801 + </state>
  802 + </provider>
  803 + </entry>
  804 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/font_awesome_4_4/font-awesome.css.scss.erb">
  805 + <provider selected="true" editor-type-id="text-editor">
  806 + <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="30600">
  807 + <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
946 <folding /> 808 <folding />
947 </state> 809 </state>
948 </provider> 810 </provider>
949 </entry> 811 </entry>
950 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 812 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
951 <provider selected="true" editor-type-id="text-editor"> 813 <provider selected="true" editor-type-id="text-editor">
952 - <state vertical-scroll-proportion="0.0" vertical-offset="342" max-vertical-offset="1050">  
953 - <caret line="33" column="22" selection-start-line="33" selection-start-column="6" selection-end-line="33" selection-end-column="22" /> 814 + <state vertical-scroll-proportion="-18.88889" vertical-offset="0" max-vertical-offset="1050">
  815 + <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
  816 + <folding />
  817 + </state>
  818 + </provider>
  819 + </entry>
  820 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  821 + <provider selected="true" editor-type-id="text-editor">
  822 + <state vertical-scroll-proportion="0.3966346" vertical-offset="0" max-vertical-offset="416">
  823 + <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
  824 + <folding />
  825 + </state>
  826 + </provider>
  827 + </entry>
  828 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/application.css">
  829 + <provider selected="true" editor-type-id="text-editor">
  830 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  831 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  832 + <folding />
  833 + </state>
  834 + </provider>
  835 + </entry>
  836 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
  837 + <provider selected="true" editor-type-id="text-editor">
  838 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7125">
  839 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  840 + <folding />
  841 + </state>
  842 + </provider>
  843 + </entry>
  844 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb">
  845 + <provider selected="true" editor-type-id="text-editor">
  846 + <state vertical-scroll-proportion="0.14423077" vertical-offset="0" max-vertical-offset="416">
  847 + <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="33" />
  848 + <folding />
  849 + </state>
  850 + </provider>
  851 + </entry>
  852 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  853 + <provider selected="true" editor-type-id="text-editor">
  854 + <state vertical-scroll-proportion="-6.4444447" vertical-offset="1896" max-vertical-offset="2805">
  855 + <caret line="138" column="80" selection-start-line="138" selection-start-column="80" selection-end-line="138" selection-end-column="80" />
954 <folding /> 856 <folding />
955 </state> 857 </state>
956 </provider> 858 </provider>
957 </entry> 859 </entry>
958 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 860 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
959 <provider selected="true" editor-type-id="text-editor"> 861 <provider selected="true" editor-type-id="text-editor">
960 - <state vertical-scroll-proportion="0.036057692" vertical-offset="0" max-vertical-offset="416"> 862 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
961 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" /> 863 <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
962 <folding /> 864 <folding />
963 </state> 865 </state>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.63) 4 + kanjai (0.0.64)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -61,15 +61,15 @@ GEM @@ -61,15 +61,15 @@ GEM
61 tzinfo (~> 1.1) 61 tzinfo (~> 1.1)
62 acts_as_list (0.8.2) 62 acts_as_list (0.8.2)
63 activerecord (>= 3.0) 63 activerecord (>= 3.0)
64 - acts_as_tree (2.5.1) 64 + acts_as_tree (2.6.0)
65 activerecord (>= 3.0.0) 65 activerecord (>= 3.0.0)
66 arel (6.0.3) 66 arel (6.0.3)
67 - aws-sdk (2.6.5)  
68 - aws-sdk-resources (= 2.6.5)  
69 - aws-sdk-core (2.6.5) 67 + aws-sdk (2.6.18)
  68 + aws-sdk-resources (= 2.6.18)
  69 + aws-sdk-core (2.6.18)
70 jmespath (~> 1.0) 70 jmespath (~> 1.0)
71 - aws-sdk-resources (2.6.5)  
72 - aws-sdk-core (= 2.6.5) 71 + aws-sdk-resources (2.6.18)
  72 + aws-sdk-core (= 2.6.18)
73 backport_new_renderer (1.0.0) 73 backport_new_renderer (1.0.0)
74 rails 74 rails
75 bcrypt (3.1.11) 75 bcrypt (3.1.11)
@@ -154,8 +154,7 @@ GEM @@ -154,8 +154,7 @@ GEM
154 rake (>= 0.8.7) 154 rake (>= 0.8.7)
155 thor (>= 0.18.1, < 2.0) 155 thor (>= 0.18.1, < 2.0)
156 rake (11.1.2) 156 rake (11.1.2)
157 - rdoc (4.2.2)  
158 - json (~> 1.4) 157 + rdoc (4.3.0)
159 ref (2.0.0) 158 ref (2.0.0)
160 responders (2.3.0) 159 responders (2.3.0)
161 railties (>= 4.2.0, < 5.1) 160 railties (>= 4.2.0, < 5.1)
@@ -183,7 +182,7 @@ GEM @@ -183,7 +182,7 @@ GEM
183 sprockets (>= 2.8, < 4.0) 182 sprockets (>= 2.8, < 4.0)
184 sprockets-rails (>= 2.0, < 4.0) 183 sprockets-rails (>= 2.0, < 4.0)
185 tilt (>= 1.1, < 3) 184 tilt (>= 1.1, < 3)
186 - sdoc (0.4.1) 185 + sdoc (0.4.2)
187 json (~> 1.7, >= 1.7.7) 186 json (~> 1.7, >= 1.7.7)
188 rdoc (~> 4.0) 187 rdoc (~> 4.0)
189 sprockets (3.7.0) 188 sprockets (3.7.0)
@@ -201,7 +200,7 @@ GEM @@ -201,7 +200,7 @@ GEM
201 tilt (2.0.5) 200 tilt (2.0.5)
202 tzinfo (1.2.2) 201 tzinfo (1.2.2)
203 thread_safe (~> 0.1) 202 thread_safe (~> 0.1)
204 - uglifier (3.0.2) 203 + uglifier (3.0.3)
205 execjs (>= 0.3.0, < 3) 204 execjs (>= 0.3.0, < 3)
206 warden (1.2.6) 205 warden (1.2.6)
207 rack (>= 1.0) 206 rack (>= 1.0)
@@ -132,11 +132,11 @@ module Kanjai @@ -132,11 +132,11 @@ module Kanjai
132 end 132 end
133 layer.gsub!(marker, content) 133 layer.gsub!(marker, content)
134 when '###CSRF_PARAM###' 134 when '###CSRF_PARAM###'
135 - if current_admin_user 135 + if current_admin_user || (!!UserSession && UserSession.current_user)
136 layer.gsub!(marker, Rack::Utils.escape_html(request_forgery_protection_token)) 136 layer.gsub!(marker, Rack::Utils.escape_html(request_forgery_protection_token))
137 end 137 end
138 when '###CSRF_TOKEN###' 138 when '###CSRF_TOKEN###'
139 - if current_admin_user 139 + if current_admin_user || (!!UserSession && UserSession.current_user)
140 layer.gsub!(marker, Rack::Utils.escape_html(form_authenticity_token)) 140 layer.gsub!(marker, Rack::Utils.escape_html(form_authenticity_token))
141 end 141 end
142 when '###DOMAIN_NAME###' 142 when '###DOMAIN_NAME###'
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.64" 2 + VERSION = "0.0.65"
3 end 3 end