EDIT / kanjai · Commits

Commit a814566fbbc02f6b370ea0351176c54b18225085

Authored by Karpikau Andrei
1 parent 1a7c199b

add show only for not login user to page

Inline Side-by-side
Showing 9 changed files with 205 additions and 281 deletions
... ... @@ -133,10 +133,10 @@
133 133 <orderEntry type="library" scope="PROVIDED" name="activemodel (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
134 134 <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
135 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.7.4, rbenv: 2.1.3) [gem]" level="application" />
  136 + <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.5, rbenv: 2.1.3) [gem]" level="application" />
137 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
138 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.3.2, rbenv: 2.1.3) [gem]" level="application" />
  139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.3.20, rbenv: 2.1.3) [gem]" level="application" />
140 140 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.2, rbenv: 2.1.3) [gem]" level="application" />
141 141 <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.2, rbenv: 2.1.3) [gem]" level="application" />
142 142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -147,7 +147,7 @@
147 147 <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.3, rbenv: 2.1.3) [gem]" level="application" />
148 148 <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.2, rbenv: 2.1.3) [gem]" level="application" />
149 149 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
150   - <orderEntry type="library" scope="PROVIDED" name="devise (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
  150 + <orderEntry type="library" scope="PROVIDED" name="devise (v4.2.0, rbenv: 2.1.3) [gem]" level="application" />
151 151 <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
152 152 <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
153 153 <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -191,7 +191,7 @@
191 191 <orderEntry type="library" scope="PROVIDED" name="rspec-rails (v3.4.2, rbenv: 2.1.3) [gem]" level="application" />
192 192 <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.4.1, rbenv: 2.1.3) [gem]" level="application" />
193 193 <orderEntry type="library" scope="PROVIDED" name="sass (v3.4.22, rbenv: 2.1.3) [gem]" level="application" />
194   - <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.4, rbenv: 2.1.3) [gem]" level="application" />
  194 + <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.5, rbenv: 2.1.3) [gem]" level="application" />
195 195 <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.1, rbenv: 2.1.3) [gem]" level="application" />
196 196 <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.6.0, rbenv: 2.1.3) [gem]" level="application" />
197 197 <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.0.4, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -25,101 +25,101 @@
25 25 </component>
26 26 <component name="FileEditorManager">
27 27 <leaf>
28   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
29   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  28 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
32   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  31 + <state vertical-scroll-proportion="0.0" vertical-offset="180" max-vertical-offset="2505">
  32 + <caret line="12" column="26" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
33 33 <folding />
34 34 </state>
35 35 </provider>
36 36 </entry>
37 37 </file>
38   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  38 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
40 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="19.74074" vertical-offset="1268" max-vertical-offset="2505">
42   - <caret line="49" column="26" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="26" />
  41 + <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="990">
  42 + <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
43 43 <folding />
44 44 </state>
45 45 </provider>
46 46 </entry>
47 47 </file>
48   - <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  48 + <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
50 50 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="-13.592592" vertical-offset="473" max-vertical-offset="2055">
52   - <caret line="56" column="69" selection-start-line="56" selection-start-column="69" selection-end-line="56" selection-end-column="69" />
  51 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  52 + <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
53 53 <folding />
54 54 </state>
55 55 </provider>
56 56 </entry>
57 57 </file>
58   - <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  58 + <file leaf-file-name="kanjai_tasks.rake" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
60 60 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="-19.703703" vertical-offset="1658" max-vertical-offset="2520">
62   - <caret line="146" column="26" selection-start-line="146" selection-start-column="8" selection-end-line="146" selection-end-column="26" />
  61 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="150">
  62 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
63 63 <folding />
64 64 </state>
65 65 </provider>
66 66 </entry>
67 67 </file>
68   - <file leaf-file-name="README.rdoc" pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/README.rdoc">
  68 + <file leaf-file-name="20160707115443_add_show_public_only_to_kanjai_pages.rb" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
70 70 <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="120">
72   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  71 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
  72 + <caret line="2" column="47" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="47" />
73 73 <folding />
74 74 </state>
75 75 </provider>
76 76 </entry>
77 77 </file>
78   - <file leaf-file-name="page_datum.rb" pinned="false" current-in-tab="false">
79   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
  78 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
80 80 <provider selected="true" editor-type-id="text-editor">
81   - <state vertical-scroll-proportion="0.0" vertical-offset="11" max-vertical-offset="735">
82   - <caret line="39" column="15" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="3596" max-vertical-offset="4230">
  82 + <caret line="250" column="136" selection-start-line="250" selection-start-column="120" selection-end-line="250" selection-end-column="136" />
83 83 <folding />
84 84 </state>
85 85 </provider>
86 86 </entry>
87 87 </file>
88   - <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
89   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  88 + <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
90 90 <provider selected="true" editor-type-id="text-editor">
91   - <state vertical-scroll-proportion="0.0" vertical-offset="296" max-vertical-offset="1410">
92   - <caret line="25" column="23" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="23" />
  91 + <state vertical-scroll-proportion="-16.666666" vertical-offset="320" max-vertical-offset="1380">
  92 + <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
93 93 <folding />
94 94 </state>
95 95 </provider>
96 96 </entry>
97 97 </file>
98   - <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
99   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  98 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
100 100 <provider selected="true" editor-type-id="text-editor">
101   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="180">
102   - <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
  101 + <state vertical-scroll-proportion="0.0" vertical-offset="1185" max-vertical-offset="4395">
  102 + <caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
103 103 <folding />
104 104 </state>
105 105 </provider>
106 106 </entry>
107 107 </file>
108   - <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
109   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  108 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  109 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
110 110 <provider selected="true" editor-type-id="text-editor">
111   - <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
112   - <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
  111 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  112 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
113 113 <folding />
114 114 </state>
115 115 </provider>
116 116 </entry>
117 117 </file>
118   - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
119   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  118 + <file leaf-file-name="en.yml" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
120 120 <provider selected="true" editor-type-id="text-editor">
121   - <state vertical-scroll-proportion="0.0" vertical-offset="2265" max-vertical-offset="4380">
122   - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
  121 + <state vertical-scroll-proportion="0.0" vertical-offset="375" max-vertical-offset="1815">
  122 + <caret line="43" column="31" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" />
123 123 <folding />
124 124 </state>
125 125 </provider>
... ... @@ -130,14 +130,10 @@
130 130 <component name="IdeDocumentHistory">
131 131 <option name="CHANGED_PATHS">
132 132 <list>
133   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb" />
134   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb" />
135   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/meta.html.erb" />
136 133 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/font_awesome_4_4/font-awesome.css.scss" />
137 134 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/font_awesome_4_4/font-awesome.css.scss.erb" />
138 135 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb" />
139 136 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/underscore.js" />
140   - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
141 137 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb" />
142 138 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb" />
143 139 <option value="$PROJECT_DIR$/Gemfile" />
... ... @@ -168,18 +164,22 @@
168 164 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
169 165 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
170 166 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
171   - <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
172 167 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
173 168 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
174 169 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
175 170 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
176 171 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
177 172 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
178   - <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
179 173 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
180 174 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
181   - <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
182 175 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
  176 + <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
  177 + <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  178 + <option value="$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb" />
  179 + <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
  180 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb" />
  181 + <option value="$PROJECT_DIR$/config/locales/en.yml" />
  182 + <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
183 183 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
184 184 </list>
185 185 </option>
... ... @@ -215,8 +215,8 @@
215 215 <sortByType />
216 216 </navigator>
217 217 <panes>
218   - <pane id="Scope" />
219 218 <pane id="RailsProjectView" />
  219 + <pane id="Scope" />
220 220 <pane id="ProjectPane">
221 221 <subPane>
222 222 <PATH>
... ... @@ -263,60 +263,6 @@
263 263 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
264 264 </PATH_ELEMENT>
265 265 <PATH_ELEMENT>
266   - <option name="myItemId" value="tasks" />
267   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
268   - </PATH_ELEMENT>
269   - </PATH>
270   - <PATH>
271   - <PATH_ELEMENT>
272   - <option name="myItemId" value="kanjai" />
273   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
274   - </PATH_ELEMENT>
275   - <PATH_ELEMENT>
276   - <option name="myItemId" value="kanjai" />
277   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
278   - </PATH_ELEMENT>
279   - <PATH_ELEMENT>
280   - <option name="myItemId" value="lib" />
281   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
282   - </PATH_ELEMENT>
283   - <PATH_ELEMENT>
284   - <option name="myItemId" value="kanjai" />
285   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
286   - </PATH_ELEMENT>
287   - </PATH>
288   - <PATH>
289   - <PATH_ELEMENT>
290   - <option name="myItemId" value="kanjai" />
291   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
292   - </PATH_ELEMENT>
293   - <PATH_ELEMENT>
294   - <option name="myItemId" value="kanjai" />
295   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
296   - </PATH_ELEMENT>
297   - <PATH_ELEMENT>
298   - <option name="myItemId" value="app" />
299   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
300   - </PATH_ELEMENT>
301   - </PATH>
302   - <PATH>
303   - <PATH_ELEMENT>
304   - <option name="myItemId" value="kanjai" />
305   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
306   - </PATH_ELEMENT>
307   - <PATH_ELEMENT>
308   - <option name="myItemId" value="kanjai" />
309   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
310   - </PATH_ELEMENT>
311   - <PATH_ELEMENT>
312   - <option name="myItemId" value="app" />
313   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
314   - </PATH_ELEMENT>
315   - <PATH_ELEMENT>
316   - <option name="myItemId" value="models" />
317   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
318   - </PATH_ELEMENT>
319   - <PATH_ELEMENT>
320 266 <option name="myItemId" value="kanjai" />
321 267 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
322 268 </PATH_ELEMENT>
... ... @@ -331,15 +277,7 @@
331 277 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
332 278 </PATH_ELEMENT>
333 279 <PATH_ELEMENT>
334   - <option name="myItemId" value="app" />
335   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
336   - </PATH_ELEMENT>
337   - <PATH_ELEMENT>
338   - <option name="myItemId" value="helpers" />
339   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
340   - </PATH_ELEMENT>
341   - <PATH_ELEMENT>
342   - <option name="myItemId" value="kanjai" />
  280 + <option name="myItemId" value="config" />
343 281 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
344 282 </PATH_ELEMENT>
345 283 </PATH>
... ... @@ -357,15 +295,7 @@
357 295 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
358 296 </PATH_ELEMENT>
359 297 <PATH_ELEMENT>
360   - <option name="myItemId" value="helpers" />
361   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
362   - </PATH_ELEMENT>
363   - <PATH_ELEMENT>
364   - <option name="myItemId" value="kanjai" />
365   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
366   - </PATH_ELEMENT>
367   - <PATH_ELEMENT>
368   - <option name="myItemId" value="admin" />
  298 + <option name="myItemId" value="views" />
369 299 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
370 300 </PATH_ELEMENT>
371 301 </PATH>
... ... @@ -382,32 +312,6 @@
382 312 <option name="myItemId" value="app" />
383 313 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
384 314 </PATH_ELEMENT>
385   - <PATH_ELEMENT>
386   - <option name="myItemId" value="controllers" />
387   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
388   - </PATH_ELEMENT>
389   - <PATH_ELEMENT>
390   - <option name="myItemId" value="kanjai" />
391   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
392   - </PATH_ELEMENT>
393   - </PATH>
394   - <PATH>
395   - <PATH_ELEMENT>
396   - <option name="myItemId" value="kanjai" />
397   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
398   - </PATH_ELEMENT>
399   - <PATH_ELEMENT>
400   - <option name="myItemId" value="kanjai" />
401   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
402   - </PATH_ELEMENT>
403   - <PATH_ELEMENT>
404   - <option name="myItemId" value="app" />
405   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
406   - </PATH_ELEMENT>
407   - <PATH_ELEMENT>
408   - <option name="myItemId" value="assets" />
409   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
410   - </PATH_ELEMENT>
411 315 </PATH>
412 316 </subPane>
413 317 </pane>
... ... @@ -598,20 +502,20 @@
598 502 <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" />
599 503 <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" />
600 504 <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" />
601   - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34006462" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  505 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.36833602" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
602 506 <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" />
603 507 <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" />
604 508 <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" />
605 509 <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" />
606 510 <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" />
607   - <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" />
608 511 <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" />
  512 + <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" />
609 513 <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" />
610 514 <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" />
611 515 <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" />
612   - <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" />
613   - <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" />
614 516 <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" />
  517 + <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" />
  518 + <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" />
615 519 </layout>
616 520 </component>
617 521 <component name="Vcs.Log.UiProperties">
... ... @@ -635,76 +539,6 @@
635 539 <watches-manager />
636 540 </component>
637 541 <component name="editorHistoryManager">
638   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
639   - <provider selected="true" editor-type-id="text-editor">
640   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
641   - <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
642   - </state>
643   - </provider>
644   - </entry>
645   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
646   - <provider selected="true" editor-type-id="text-editor">
647   - <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="390">
648   - <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />
649   - </state>
650   - </provider>
651   - </entry>
652   - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
653   - <provider selected="true" editor-type-id="text-editor">
654   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
655   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
656   - </state>
657   - </provider>
658   - </entry>
659   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
660   - <provider selected="true" editor-type-id="text-editor">
661   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
662   - <caret line="0" column="24" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
663   - </state>
664   - </provider>
665   - </entry>
666   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
667   - <provider selected="true" editor-type-id="text-editor">
668   - <state vertical-scroll-proportion="-8.875" vertical-offset="3822" max-vertical-offset="95070">
669   - <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
670   - </state>
671   - </provider>
672   - </entry>
673   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
674   - <provider selected="true" editor-type-id="text-editor">
675   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
676   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
677   - </state>
678   - </provider>
679   - </entry>
680   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
681   - <provider selected="true" editor-type-id="text-editor">
682   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
683   - <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
684   - </state>
685   - </provider>
686   - </entry>
687   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
688   - <provider selected="true" editor-type-id="text-editor">
689   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4230">
690   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
691   - </state>
692   - </provider>
693   - </entry>
694   - <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
695   - <provider selected="true" editor-type-id="text-editor">
696   - <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="2520">
697   - <caret line="29" column="15" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="15" />
698   - </state>
699   - </provider>
700   - </entry>
701   - <entry file="file://$PROJECT_DIR$/app/views/shared/_extend_admin_menu.html.erb">
702   - <provider selected="true" editor-type-id="text-editor">
703   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
704   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
705   - </state>
706   - </provider>
707   - </entry>
708 542 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/config_controller.rb">
709 543 <provider selected="true" editor-type-id="text-editor">
710 544 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -845,21 +679,6 @@
845 679 </state>
846 680 </provider>
847 681 </entry>
848   - <entry file="file://$PROJECT_DIR$/Gemfile">
849   - <provider selected="true" editor-type-id="text-editor">
850   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
851   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
852   - <folding />
853   - </state>
854   - </provider>
855   - </entry>
856   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
857   - <provider selected="true" editor-type-id="text-editor">
858   - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
859   - <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
860   - </state>
861   - </provider>
862   - </entry>
863 682 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb">
864 683 <provider selected="true" editor-type-id="text-editor">
865 684 <state vertical-scroll-proportion="0.14754099" vertical-offset="0" max-vertical-offset="610">
... ... @@ -874,13 +693,6 @@
874 693 </state>
875 694 </provider>
876 695 </entry>
877   - <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
878   - <provider selected="true" editor-type-id="text-editor">
879   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
880   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
881   - </state>
882   - </provider>
883   - </entry>
884 696 <entry file="file://$PROJECT_DIR$/app/models/kanjai/admin_user.rb">
885 697 <provider selected="true" editor-type-id="text-editor">
886 698 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -888,19 +700,10 @@
888 700 </state>
889 701 </provider>
890 702 </entry>
891   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
892   - <provider selected="true" editor-type-id="text-editor">
893   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="990">
894   - <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
895   - <folding />
896   - </state>
897   - </provider>
898   - </entry>
899 703 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
900 704 <provider selected="true" editor-type-id="text-editor">
901 705 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
902 706 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
903   - <folding />
904 707 </state>
905 708 </provider>
906 709 </entry>
... ... @@ -908,7 +711,6 @@
908 711 <provider selected="true" editor-type-id="text-editor">
909 712 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
910 713 <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
911   - <folding />
912 714 </state>
913 715 </provider>
914 716 </entry>
... ... @@ -916,7 +718,6 @@
916 718 <provider selected="true" editor-type-id="text-editor">
917 719 <state vertical-scroll-proportion="0.0" vertical-offset="296" max-vertical-offset="1410">
918 720 <caret line="25" column="23" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="23" />
919   - <folding />
920 721 </state>
921 722 </provider>
922 723 </entry>
... ... @@ -924,7 +725,6 @@
924 725 <provider selected="true" editor-type-id="text-editor">
925 726 <state vertical-scroll-proportion="0.0" vertical-offset="11" max-vertical-offset="735">
926 727 <caret line="39" column="15" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
927   - <folding />
928 728 </state>
929 729 </provider>
930 730 </entry>
... ... @@ -932,7 +732,6 @@
932 732 <provider selected="true" editor-type-id="text-editor">
933 733 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
934 734 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
935   - <folding />
936 735 </state>
937 736 </provider>
938 737 </entry>
... ... @@ -943,57 +742,168 @@
943 742 </state>
944 743 </provider>
945 744 </entry>
946   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  745 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  746 + <provider selected="true" editor-type-id="text-editor">
  747 + <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
  748 + <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
  749 + </state>
  750 + </provider>
  751 + </entry>
  752 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  753 + <provider selected="true" editor-type-id="text-editor">
  754 + <state vertical-scroll-proportion="0.0" vertical-offset="473" max-vertical-offset="2055">
  755 + <caret line="56" column="69" selection-start-line="56" selection-start-column="69" selection-end-line="56" selection-end-column="69" />
  756 + </state>
  757 + </provider>
  758 + </entry>
  759 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
  760 + <provider selected="true" editor-type-id="text-editor">
  761 + <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="2250">
  762 + <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
  763 + <folding />
  764 + </state>
  765 + </provider>
  766 + </entry>
  767 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  768 + <provider selected="true" editor-type-id="text-editor">
  769 + <state vertical-scroll-proportion="0.0" vertical-offset="398" max-vertical-offset="1140">
  770 + <caret line="40" column="26" selection-start-line="40" selection-start-column="20" selection-end-line="40" selection-end-column="26" />
  771 + <folding />
  772 + </state>
  773 + </provider>
  774 + </entry>
  775 + <entry file="file://$PROJECT_DIR$/Gemfile">
947 776 <provider selected="true" editor-type-id="text-editor">
948 777 <state vertical-scroll-proportion="0.26025236" vertical-offset="0" max-vertical-offset="634">
949   - <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  778 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  779 + <folding />
  780 + </state>
  781 + </provider>
  782 + </entry>
  783 + <entry file="file://$PROJECT_DIR$/.ruby-version">
  784 + <provider selected="true" editor-type-id="text-editor">
  785 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  786 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  787 + <folding />
  788 + </state>
  789 + </provider>
  790 + </entry>
  791 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  792 + <provider selected="true" editor-type-id="text-editor">
  793 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
  794 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  795 + <folding />
  796 + </state>
  797 + </provider>
  798 + </entry>
  799 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  800 + <provider selected="true" editor-type-id="text-editor">
  801 + <state vertical-scroll-proportion="0.0" vertical-offset="1643" max-vertical-offset="2520">
  802 + <caret line="137" column="47" selection-start-line="137" selection-start-column="41" selection-end-line="137" selection-end-column="47" />
  803 + <folding />
950 804 </state>
951 805 </provider>
952 806 </entry>
953 807 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
954 808 <provider selected="true" editor-type-id="text-editor">
955   - <state vertical-scroll-proportion="0.30757096" vertical-offset="0" max-vertical-offset="634">
  809 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
956 810 <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
957 811 <folding />
958 812 </state>
959 813 </provider>
960 814 </entry>
961   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  815 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
962 816 <provider selected="true" editor-type-id="text-editor">
963   - <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
964   - <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
  817 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2505">
  818 + <caret line="12" column="26" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="26" />
965 819 <folding />
966 820 </state>
967 821 </provider>
968 822 </entry>
969   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  823 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
970 824 <provider selected="true" editor-type-id="text-editor">
971   - <state vertical-scroll-proportion="0.0" vertical-offset="2265" max-vertical-offset="4380">
972   - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
  825 + <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="990">
  826 + <caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
973 827 <folding />
974 828 </state>
975 829 </provider>
976 830 </entry>
977   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  831 + <entry file="file://$PROJECT_DIR$/db/migrate/20160423203127_add_lang_to_page_content_markers.rb">
978 832 <provider selected="true" editor-type-id="text-editor">
979   - <state vertical-scroll-proportion="-19.703703" vertical-offset="1658" max-vertical-offset="2520">
980   - <caret line="146" column="26" selection-start-line="146" selection-start-column="8" selection-end-line="146" selection-end-column="26" />
  833 + <state vertical-scroll-proportion="0.04731861" vertical-offset="0" max-vertical-offset="634">
  834 + <caret line="2" column="59" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="59" />
981 835 <folding />
982 836 </state>
983 837 </provider>
984 838 </entry>
985   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  839 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
986 840 <provider selected="true" editor-type-id="text-editor">
987   - <state vertical-scroll-proportion="19.74074" vertical-offset="1268" max-vertical-offset="2505">
988   - <caret line="49" column="26" selection-start-line="49" selection-start-column="8" selection-end-line="49" selection-end-column="26" />
  841 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  842 + <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
989 843 <folding />
990 844 </state>
991 845 </provider>
992 846 </entry>
993   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  847 + <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
994 848 <provider selected="true" editor-type-id="text-editor">
995   - <state vertical-scroll-proportion="-13.592592" vertical-offset="473" max-vertical-offset="2055">
996   - <caret line="56" column="69" selection-start-line="56" selection-start-column="69" selection-end-line="56" selection-end-column="69" />
  849 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="150">
  850 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
  851 + <folding />
  852 + </state>
  853 + </provider>
  854 + </entry>
  855 + <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
  856 + <provider selected="true" editor-type-id="text-editor">
  857 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
  858 + <caret line="2" column="47" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="47" />
  859 + <folding />
  860 + </state>
  861 + </provider>
  862 + </entry>
  863 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
  864 + <provider selected="true" editor-type-id="text-editor">
  865 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  866 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  867 + <folding />
  868 + </state>
  869 + </provider>
  870 + </entry>
  871 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  872 + <provider selected="true" editor-type-id="text-editor">
  873 + <state vertical-scroll-proportion="0.0" vertical-offset="3596" max-vertical-offset="4230">
  874 + <caret line="250" column="136" selection-start-line="250" selection-start-column="120" selection-end-line="250" selection-end-column="136" />
  875 + <folding />
  876 + </state>
  877 + </provider>
  878 + </entry>
  879 + <entry file="file://$PROJECT_DIR$/config/locales/de.yml">
  880 + <provider selected="true" editor-type-id="text-editor">
  881 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  882 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  883 + <folding />
  884 + </state>
  885 + </provider>
  886 + </entry>
  887 + <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
  888 + <provider selected="true" editor-type-id="text-editor">
  889 + <state vertical-scroll-proportion="0.0" vertical-offset="375" max-vertical-offset="1815">
  890 + <caret line="43" column="31" selection-start-line="43" selection-start-column="31" selection-end-line="43" selection-end-column="31" />
  891 + <folding />
  892 + </state>
  893 + </provider>
  894 + </entry>
  895 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
  896 + <provider selected="true" editor-type-id="text-editor">
  897 + <state vertical-scroll-proportion="-16.666666" vertical-offset="320" max-vertical-offset="1380">
  898 + <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
  899 + <folding />
  900 + </state>
  901 + </provider>
  902 + </entry>
  903 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  904 + <provider selected="true" editor-type-id="text-editor">
  905 + <state vertical-scroll-proportion="0.0" vertical-offset="1185" max-vertical-offset="4395">
  906 + <caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
997 907 <folding />
998 908 </state>
999 909 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.42)
  4 + kanjai (0.0.43)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -248,7 +248,7 @@ module Kanjai
248 248 private
249 249
250 250 def permitted_params
251   - params.permit(:page => [:parent_id, :page_template_id, :title, :private_flag, :default_private_page, :root_page,
  251 + params.permit(:page => [:parent_id, :page_template_id, :title, :private_flag, :default_private_page, :root_page, :show_public_only,
252 252 :page_data_attributes => [:id, :title, :url, :meta_title, :meta_description, :meta_keywords]],
253 253 :page_content => [:type_content, :text_html, :controller_name, :action_name,
254 254 page_content_markers_attributes: [:id, :page_content_id, :marker, :text_value, :attachment_file_name]
... ...
... ... @@ -45,6 +45,13 @@
45 45 </div>
46 46 </div>
47 47
  48 + <div class="form-group">
  49 + <%= form.label :show_public_only, t('activerecord.attributes.page.show_public_only'), :class => "col-sm-2 control-label" %>
  50 + <div class="col-sm-10">
  51 + <%= form.check_box :show_public_only %>
  52 + </div>
  53 + </div>
  54 +
48 55
49 56 <h4><%= t('admin.pages.edit_lang_content', :lang => params[:lang]) %></h4>
50 57 <%= form.fields_for :page_data, @page.page_data.where(lang: params[:lang]) do |form2| %>
... ...
... ... @@ -56,6 +56,7 @@ en:
56 56 meta_title: Meta Title
57 57 meta_description: Meta Description
58 58 meta_keywords: Meta Keywords
  59 + show_public_only: "Show only for not login user"
59 60 page_content:
60 61 type_content: "Content Type"
61 62 page_lang:
... ...
  1 +class AddShowPublicOnlyToKanjaiPages < ActiveRecord::Migration
  2 + def change
  3 + add_column :kanjai_pages, :show_public_only, :boolean, default: false
  4 + end
  5 +end
... ...
... ... @@ -90,7 +90,8 @@ module Kanjai
90 90 begin
91 91 if !!UserSession
92 92 if UserSession.current_user
93   - page_collection = page_collection.where(private_flag => [true, false])
  93 + page_collection = page_collection.where(:private_flag => [true, false])
  94 + .where(show_public_only: false)
94 95 else
95 96 page_collection = page_collection.where(private_flag: false)
96 97 end
... ...
1 1 module Kanjai
2   - VERSION = "0.0.43"
  2 + VERSION = "0.0.44"
3 3 end
... ...