EDIT / kanjai · Commits

Commit c271a8dce756a140fe6fe6d0d00dfe012aac96e5

Authored by Karpikau Andrei
1 parent a814566f

small check

Inline Side-by-side
Showing 10 changed files with 252 additions and 229 deletions
... ... @@ -136,9 +136,9 @@
136 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.20, rbenv: 2.1.3) [gem]" level="application" />
140   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.2, rbenv: 2.1.3) [gem]" level="application" />
141   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.2, rbenv: 2.1.3) [gem]" level="application" />
  139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.3.22, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.20, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.20, 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" />
143 143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
144 144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -159,7 +159,7 @@
159 159 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.2.4, rbenv: 2.1.3) [gem]" level="application" />
160 160 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" />
161 161 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
162   - <orderEntry type="library" scope="PROVIDED" name="json_pure (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
  162 + <orderEntry type="library" scope="PROVIDED" name="json_pure (v2.0.1, rbenv: 2.1.3) [gem]" level="application" />
163 163 <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.15, rbenv: 2.1.3) [gem]" level="application" />
164 164 <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.1.3) [gem]" level="application" />
165 165 <orderEntry type="library" scope="PROVIDED" name="mail (v2.6.4, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -193,8 +193,8 @@
193 193 <orderEntry type="library" scope="PROVIDED" name="sass (v3.4.22, rbenv: 2.1.3) [gem]" level="application" />
194 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   - <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.6.0, rbenv: 2.1.3) [gem]" level="application" />
197   - <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.0.4, rbenv: 2.1.3) [gem]" level="application" />
  196 + <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.6.3, rbenv: 2.1.3) [gem]" level="application" />
  197 + <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.1.1, rbenv: 2.1.3) [gem]" level="application" />
198 198 <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, rbenv: 2.1.3) [gem]" level="application" />
199 199 <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, rbenv: 2.1.3) [gem]" level="application" />
200 200 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -28,8 +28,8 @@
28 28 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
29 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.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" />
  31 + <state vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="2565">
  32 + <caret line="138" column="131" selection-start-line="138" selection-start-column="131" selection-end-line="138" selection-end-column="131" />
33 33 <folding />
34 34 </state>
35 35 </provider>
... ... @@ -38,58 +38,48 @@
38 38 <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
39 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="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" />
  41 + <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="1035">
  42 + <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
43 43 <folding />
44 44 </state>
45 45 </provider>
46 46 </entry>
47 47 </file>
48   - <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  48 + <file leaf-file-name="frontend_extend.css.scss" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
50 50 <provider selected="true" editor-type-id="text-editor">
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" />
  51 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
  52 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
53 53 <folding />
54 54 </state>
55 55 </provider>
56 56 </entry>
57 57 </file>
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   - <provider selected="true" editor-type-id="text-editor">
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   - <folding />
64   - </state>
65   - </provider>
66   - </entry>
67   - </file>
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">
  58 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  59 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
70 60 <provider selected="true" editor-type-id="text-editor">
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" />
  61 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  62 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
73 63 <folding />
74 64 </state>
75 65 </provider>
76 66 </entry>
77 67 </file>
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">
  68 + <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
80 70 <provider selected="true" editor-type-id="text-editor">
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" />
  71 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  72 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
83 73 <folding />
84 74 </state>
85 75 </provider>
86 76 </entry>
87 77 </file>
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">
  78 + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
90 80 <provider selected="true" editor-type-id="text-editor">
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" />
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="435">
  82 + <caret line="16" column="181" selection-start-line="16" selection-start-column="181" selection-end-line="16" selection-end-column="181" />
93 83 <folding />
94 84 </state>
95 85 </provider>
... ... @@ -98,28 +88,28 @@
98 88 <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
99 89 <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
100 90 <provider selected="true" editor-type-id="text-editor">
101   - <state vertical-scroll-proportion="0.0" vertical-offset="1185" max-vertical-offset="4395">
  91 + <state vertical-scroll-proportion="0.0" vertical-offset="2981" max-vertical-offset="4395">
102 92 <caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
103 93 <folding />
104 94 </state>
105 95 </provider>
106 96 </entry>
107 97 </file>
108   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
109   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  98 + <file leaf-file-name="content_function.rb" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
110 100 <provider selected="true" editor-type-id="text-editor">
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" />
  101 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="2520">
  102 + <caret line="5" column="15" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="15" />
113 103 <folding />
114 104 </state>
115 105 </provider>
116 106 </entry>
117 107 </file>
118   - <file leaf-file-name="en.yml" pinned="false" current-in-tab="false">
119   - <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
  108 + <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
120 110 <provider selected="true" editor-type-id="text-editor">
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" />
  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" />
123 113 <folding />
124 114 </state>
125 115 </provider>
... ... @@ -130,7 +120,6 @@
130 120 <component name="IdeDocumentHistory">
131 121 <option name="CHANGED_PATHS">
132 122 <list>
133   - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/font_awesome_4_4/font-awesome.css.scss" />
134 123 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/font_awesome_4_4/font-awesome.css.scss.erb" />
135 124 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb" />
136 125 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/underscore.js" />
... ... @@ -165,22 +154,23 @@
165 154 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
166 155 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
167 156 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
168   - <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
169 157 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
170   - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
171   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
172 158 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
173   - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
174 159 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
175 160 <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 161 <option value="$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb" />
179 162 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
180 163 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb" />
181   - <option value="$PROJECT_DIR$/config/locales/en.yml" />
182 164 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
183 165 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
  166 + <option value="$PROJECT_DIR$/config/locales/en.yml" />
  167 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/extend/test.js" />
  168 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
  169 + <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
  170 + <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
  171 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  172 + <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
  173 + <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
184 174 </list>
185 175 </option>
186 176 </component>
... ... @@ -215,8 +205,6 @@
215 205 <sortByType />
216 206 </navigator>
217 207 <panes>
218   - <pane id="RailsProjectView" />
219   - <pane id="Scope" />
220 208 <pane id="ProjectPane">
221 209 <subPane>
222 210 <PATH>
... ... @@ -277,7 +265,29 @@
277 265 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
278 266 </PATH_ELEMENT>
279 267 <PATH_ELEMENT>
280   - <option name="myItemId" value="config" />
  268 + <option name="myItemId" value="app" />
  269 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  270 + </PATH_ELEMENT>
  271 + </PATH>
  272 + <PATH>
  273 + <PATH_ELEMENT>
  274 + <option name="myItemId" value="kanjai" />
  275 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  276 + </PATH_ELEMENT>
  277 + <PATH_ELEMENT>
  278 + <option name="myItemId" value="kanjai" />
  279 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  280 + </PATH_ELEMENT>
  281 + <PATH_ELEMENT>
  282 + <option name="myItemId" value="app" />
  283 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  284 + </PATH_ELEMENT>
  285 + <PATH_ELEMENT>
  286 + <option name="myItemId" value="controllers" />
  287 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  288 + </PATH_ELEMENT>
  289 + <PATH_ELEMENT>
  290 + <option name="myItemId" value="kanjai" />
281 291 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
282 292 </PATH_ELEMENT>
283 293 </PATH>
... ... @@ -295,7 +305,15 @@
295 305 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
296 306 </PATH_ELEMENT>
297 307 <PATH_ELEMENT>
298   - <option name="myItemId" value="views" />
  308 + <option name="myItemId" value="assets" />
  309 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  310 + </PATH_ELEMENT>
  311 + <PATH_ELEMENT>
  312 + <option name="myItemId" value="stylesheets" />
  313 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  314 + </PATH_ELEMENT>
  315 + <PATH_ELEMENT>
  316 + <option name="myItemId" value="kanjai" />
299 317 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
300 318 </PATH_ELEMENT>
301 319 </PATH>
... ... @@ -312,9 +330,15 @@
312 330 <option name="myItemId" value="app" />
313 331 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
314 332 </PATH_ELEMENT>
  333 + <PATH_ELEMENT>
  334 + <option name="myItemId" value="assets" />
  335 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  336 + </PATH_ELEMENT>
315 337 </PATH>
316 338 </subPane>
317 339 </pane>
  340 + <pane id="Scope" />
  341 + <pane id="RailsProjectView" />
318 342 </panes>
319 343 </component>
320 344 <component name="PropertiesComponent">
... ... @@ -502,7 +526,7 @@
502 526 <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" />
503 527 <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" />
504 528 <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" />
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" />
  529 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39822295" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
506 530 <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" />
507 531 <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" />
508 532 <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" />
... ... @@ -539,371 +563,361 @@
539 563 <watches-manager />
540 564 </component>
541 565 <component name="editorHistoryManager">
542   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/config_controller.rb">
  566 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
543 567 <provider selected="true" editor-type-id="text-editor">
544   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
545   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  568 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
  569 + <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
546 570 </state>
547 571 </provider>
548 572 </entry>
549   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  573 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/404.html.erb">
550 574 <provider selected="true" editor-type-id="text-editor">
551   - <state vertical-scroll-proportion="-17.5" vertical-offset="0" max-vertical-offset="825">
552   - <caret line="28" column="41" selection-start-line="28" selection-start-column="41" selection-end-line="28" selection-end-column="41" />
  575 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  576 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
553 577 </state>
554 578 </provider>
555 579 </entry>
556   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_langs_controller.rb">
  580 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/admin_user.rb">
557 581 <provider selected="true" editor-type-id="text-editor">
558   - <state vertical-scroll-proportion="0.0" vertical-offset="435" max-vertical-offset="975">
559   - <caret line="46" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
  582 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  583 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
560 584 </state>
561 585 </provider>
562 586 </entry>
563   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/_error_messages.html.erb">
  587 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
564 588 <provider selected="true" editor-type-id="text-editor">
565   - <state vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="225">
566   - <caret line="4" column="38" selection-start-line="4" selection-start-column="25" selection-end-line="4" selection-end-column="38" />
  589 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  590 + <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
567 591 </state>
568 592 </provider>
569 593 </entry>
570   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/_new_form.html.erb">
  594 + <entry file="file://$PROJECT_DIR$/README.rdoc">
571 595 <provider selected="true" editor-type-id="text-editor">
572 596 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
573 597 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
574 598 </state>
575 599 </provider>
576 600 </entry>
577   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb">
  601 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
578 602 <provider selected="true" editor-type-id="text-editor">
579   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
580   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  603 + <state vertical-scroll-proportion="0.0" vertical-offset="473" max-vertical-offset="2055">
  604 + <caret line="56" column="69" selection-start-line="56" selection-start-column="69" selection-end-line="56" selection-end-column="69" />
581 605 </state>
582 606 </provider>
583 607 </entry>
584   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
  608 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
585 609 <provider selected="true" editor-type-id="text-editor">
586   - <state vertical-scroll-proportion="-9.703704" vertical-offset="1043" max-vertical-offset="1650">
587   - <caret line="87" column="68" selection-start-line="87" selection-start-column="48" selection-end-line="87" selection-end-column="68" />
  610 + <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="2250">
  611 + <caret line="25" column="21" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="21" />
588 612 </state>
589 613 </provider>
590 614 </entry>
591   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  615 + <entry file="file://$PROJECT_DIR$/.ruby-version">
592 616 <provider selected="true" editor-type-id="text-editor">
593   - <state vertical-scroll-proportion="-11.37037" vertical-offset="2093" max-vertical-offset="2745">
594   - <caret line="160" column="0" selection-start-line="158" selection-start-column="0" selection-end-line="160" selection-end-column="0" />
  617 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  618 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
595 619 </state>
596 620 </provider>
597 621 </entry>
598   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
  622 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
599 623 <provider selected="true" editor-type-id="text-editor">
600   - <state vertical-scroll-proportion="-3.75" vertical-offset="30" max-vertical-offset="660">
601   - <caret line="8" column="152" selection-start-line="8" selection-start-column="117" selection-end-line="8" selection-end-column="152" />
  624 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
  625 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
602 626 </state>
603 627 </provider>
604 628 </entry>
605   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb">
  629 + <entry file="file://$PROJECT_DIR$/db/migrate/20160423203127_add_lang_to_page_content_markers.rb">
606 630 <provider selected="true" editor-type-id="text-editor">
607   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
608   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  631 + <state vertical-scroll-proportion="0.04731861" vertical-offset="0" max-vertical-offset="634">
  632 + <caret line="2" column="59" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="59" />
609 633 </state>
610 634 </provider>
611 635 </entry>
612   - <entry file="file://$PROJECT_DIR$/config/routes.rb">
  636 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
613 637 <provider selected="true" editor-type-id="text-editor">
614   - <state vertical-scroll-proportion="0.0" vertical-offset="266" max-vertical-offset="900">
615   - <caret line="51" column="44" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="44" />
  638 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  639 + <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
616 640 </state>
617 641 </provider>
618 642 </entry>
619   - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  643 + <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
620 644 <provider selected="true" editor-type-id="text-editor">
621   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="435">
622   - <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
  645 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
  646 + <caret line="2" column="47" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="47" />
623 647 </state>
624 648 </provider>
625 649 </entry>
626   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/dashboard_controller.rb">
  650 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
627 651 <provider selected="true" editor-type-id="text-editor">
628   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="225">
629   - <caret line="2" column="29" selection-start-line="2" selection-start-column="10" selection-end-line="2" selection-end-column="29" />
  652 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  653 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
630 654 </state>
631 655 </provider>
632 656 </entry>
633   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  657 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
634 658 <provider selected="true" editor-type-id="text-editor">
635   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
636   - <caret line="1" column="23" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="23" />
  659 + <state vertical-scroll-proportion="0.0" vertical-offset="3596" max-vertical-offset="4230">
  660 + <caret line="250" column="136" selection-start-line="250" selection-start-column="120" selection-end-line="250" selection-end-column="136" />
637 661 </state>
638 662 </provider>
639 663 </entry>
640   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  664 + <entry file="file://$PROJECT_DIR$/config/locales/de.yml">
641 665 <provider selected="true" editor-type-id="text-editor">
642   - <state vertical-scroll-proportion="0.0" vertical-offset="6521" max-vertical-offset="7155">
643   - <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
  666 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  667 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
644 668 </state>
645 669 </provider>
646 670 </entry>
647   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
  671 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
648 672 <provider selected="true" editor-type-id="text-editor">
649   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="630">
650   - <caret line="35" column="37" selection-start-line="35" selection-start-column="37" selection-end-line="35" selection-end-column="37" />
  673 + <state vertical-scroll-proportion="0.0" vertical-offset="320" max-vertical-offset="1380">
  674 + <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
651 675 </state>
652 676 </provider>
653 677 </entry>
654   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
  678 + <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
655 679 <provider selected="true" editor-type-id="text-editor">
656   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
657   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  680 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="150">
  681 + <caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
658 682 </state>
659 683 </provider>
660 684 </entry>
661   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb">
  685 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb">
662 686 <provider selected="true" editor-type-id="text-editor">
663   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
664   - <caret line="0" column="37" selection-start-line="0" selection-start-column="37" selection-end-line="0" selection-end-column="37" />
  687 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  688 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="6" selection-end-column="6" />
665 689 </state>
666 690 </provider>
667 691 </entry>
668   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/404.html.erb">
  692 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
669 693 <provider selected="true" editor-type-id="text-editor">
670   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
671   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  694 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="900">
  695 + <caret line="51" column="44" selection-start-line="51" selection-start-column="4" selection-end-line="51" selection-end-column="44" />
672 696 </state>
673 697 </provider>
674 698 </entry>
675   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  699 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/edit.html.erb">
676 700 <provider selected="true" editor-type-id="text-editor">
677   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
678   - <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
  701 + <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="360">
  702 + <caret line="11" column="112" selection-start-line="11" selection-start-column="64" selection-end-line="11" selection-end-column="112" />
679 703 </state>
680 704 </provider>
681 705 </entry>
682 706 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb">
683 707 <provider selected="true" editor-type-id="text-editor">
684   - <state vertical-scroll-proportion="0.14754099" vertical-offset="0" max-vertical-offset="610">
  708 + <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="345">
685 709 <caret line="6" column="96" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="96" />
686 710 </state>
687 711 </provider>
688 712 </entry>
689 713 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/_form.html.erb">
690 714 <provider selected="true" editor-type-id="text-editor">
691   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
692   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  715 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  716 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="6" />
693 717 </state>
694 718 </provider>
695 719 </entry>
696   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/admin_user.rb">
  720 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_langs_controller.rb">
697 721 <provider selected="true" editor-type-id="text-editor">
698   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
699   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  722 + <state vertical-scroll-proportion="0.0" vertical-offset="341" max-vertical-offset="975">
  723 + <caret line="44" column="0" selection-start-line="44" selection-start-column="0" selection-end-line="48" selection-end-column="47" />
700 724 </state>
701 725 </provider>
702 726 </entry>
703   - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
  727 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb">
704 728 <provider selected="true" editor-type-id="text-editor">
705   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
706   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  729 + <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="585">
  730 + <caret line="24" column="32" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="32" />
707 731 </state>
708 732 </provider>
709 733 </entry>
710   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  734 + <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
711 735 <provider selected="true" editor-type-id="text-editor">
712   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
713   - <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
  736 + <state vertical-scroll-proportion="0.0" vertical-offset="915" max-vertical-offset="1845">
  737 + <caret line="77" column="18" selection-start-line="77" selection-start-column="18" selection-end-line="77" selection-end-column="18" />
714 738 </state>
715 739 </provider>
716 740 </entry>
717   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  741 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
718 742 <provider selected="true" editor-type-id="text-editor">
719   - <state vertical-scroll-proportion="0.0" vertical-offset="296" max-vertical-offset="1410">
720   - <caret line="25" column="23" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="23" />
  743 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="300">
  744 + <caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" />
721 745 </state>
722 746 </provider>
723 747 </entry>
724   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
  748 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
725 749 <provider selected="true" editor-type-id="text-editor">
726   - <state vertical-scroll-proportion="0.0" vertical-offset="11" max-vertical-offset="735">
727   - <caret line="39" column="15" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
  750 + <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
  751 + <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
728 752 </state>
729 753 </provider>
730 754 </entry>
731   - <entry file="file://$PROJECT_DIR$/README.rdoc">
  755 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
732 756 <provider selected="true" editor-type-id="text-editor">
733   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
734   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  757 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7155">
  758 + <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
735 759 </state>
736 760 </provider>
737 761 </entry>
738   - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  762 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
739 763 <provider selected="true" editor-type-id="text-editor">
740   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
741   - <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
  764 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  765 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
742 766 </state>
743 767 </provider>
744 768 </entry>
745   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  769 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
746 770 <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" />
  771 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="645">
  772 + <caret line="37" column="0" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
749 773 </state>
750 774 </provider>
751 775 </entry>
752   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  776 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
753 777 <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" />
  778 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  779 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
756 780 </state>
757 781 </provider>
758 782 </entry>
759   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
  783 + <entry file="file://$PROJECT_DIR$/Gemfile">
760 784 <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" />
  785 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  786 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
763 787 <folding />
764 788 </state>
765 789 </provider>
766 790 </entry>
767 791 <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
768 792 <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 />
  793 + <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="1140">
  794 + <caret line="51" column="32" selection-start-line="51" selection-start-column="20" selection-end-line="51" selection-end-column="32" />
772 795 </state>
773 796 </provider>
774 797 </entry>
775   - <entry file="file://$PROJECT_DIR$/Gemfile">
  798 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
776 799 <provider selected="true" editor-type-id="text-editor">
777   - <state vertical-scroll-proportion="0.26025236" vertical-offset="0" max-vertical-offset="634">
778   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
779   - <folding />
  800 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
  801 + <caret line="1" column="23" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="23" />
780 802 </state>
781 803 </provider>
782 804 </entry>
783   - <entry file="file://$PROJECT_DIR$/.ruby-version">
  805 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
784 806 <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 />
  807 + <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="1410">
  808 + <caret line="25" column="16" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="16" />
788 809 </state>
789 810 </provider>
790 811 </entry>
791   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  812 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
792 813 <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 />
  814 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
  815 + <caret line="0" column="21" selection-start-line="0" selection-start-column="21" selection-end-line="0" selection-end-column="21" />
796 816 </state>
797 817 </provider>
798 818 </entry>
799   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  819 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
800 820 <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 />
  821 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  822 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
804 823 </state>
805 824 </provider>
806 825 </entry>
807   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  826 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
808 827 <provider selected="true" editor-type-id="text-editor">
809   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
810   - <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
811   - <folding />
  828 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  829 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
812 830 </state>
813 831 </provider>
814 832 </entry>
815   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  833 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
816 834 <provider selected="true" editor-type-id="text-editor">
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" />
819   - <folding />
  835 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  836 + <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
820 837 </state>
821 838 </provider>
822 839 </entry>
823   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  840 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
824 841 <provider selected="true" editor-type-id="text-editor">
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" />
  842 + <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
  843 + <caret line="208" column="0" selection-start-line="208" selection-start-column="0" selection-end-line="208" selection-end-column="0" />
827 844 <folding />
828 845 </state>
829 846 </provider>
830 847 </entry>
831   - <entry file="file://$PROJECT_DIR$/db/migrate/20160423203127_add_lang_to_page_content_markers.rb">
  848 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
832 849 <provider selected="true" editor-type-id="text-editor">
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" />
  850 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  851 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
835 852 <folding />
836 853 </state>
837 854 </provider>
838 855 </entry>
839   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  856 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
840 857 <provider selected="true" editor-type-id="text-editor">
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" />
  858 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="435">
  859 + <caret line="16" column="181" selection-start-line="16" selection-start-column="181" selection-end-line="16" selection-end-column="181" />
843 860 <folding />
844 861 </state>
845 862 </provider>
846 863 </entry>
847   - <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
  864 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
848 865 <provider selected="true" editor-type-id="text-editor">
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" />
  866 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4395">
  867 + <caret line="93" column="68" selection-start-line="93" selection-start-column="68" selection-end-line="93" selection-end-column="68" />
851 868 <folding />
852 869 </state>
853 870 </provider>
854 871 </entry>
855   - <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
  872 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
856 873 <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" />
  874 + <state vertical-scroll-proportion="0.0" vertical-offset="2070" max-vertical-offset="2565">
  875 + <caret line="138" column="131" selection-start-line="138" selection-start-column="131" selection-end-line="138" selection-end-column="131" />
859 876 <folding />
860 877 </state>
861 878 </provider>
862 879 </entry>
863   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
  880 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
864 881 <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 />
  882 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  883 + <caret line="1" column="29" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="29" />
868 884 </state>
869 885 </provider>
870 886 </entry>
871   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  887 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
872 888 <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 />
  889 + <state vertical-scroll-proportion="0.0" vertical-offset="101" max-vertical-offset="735">
  890 + <caret line="39" column="15" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
876 891 </state>
877 892 </provider>
878 893 </entry>
879   - <entry file="file://$PROJECT_DIR$/config/locales/de.yml">
  894 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
880 895 <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 />
  896 + <state vertical-scroll-proportion="0.4369085" vertical-offset="1673" max-vertical-offset="2520">
  897 + <caret line="130" column="57" selection-start-line="130" selection-start-column="57" selection-end-line="130" selection-end-column="57" />
884 898 </state>
885 899 </provider>
886 900 </entry>
887   - <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
  901 + <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
888 902 <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" />
  903 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">
  904 + <caret line="5" column="15" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="15" />
891 905 <folding />
892 906 </state>
893 907 </provider>
894 908 </entry>
895   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
  909 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
896 910 <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" />
  911 + <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="1035">
  912 + <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
899 913 <folding />
900 914 </state>
901 915 </provider>
902 916 </entry>
903   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  917 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
904 918 <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" />
  919 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  920 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
907 921 <folding />
908 922 </state>
909 923 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.43)
  4 + kanjai (0.0.44)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -59,17 +59,17 @@ GEM
59 59 minitest (~> 5.1)
60 60 thread_safe (~> 0.3, >= 0.3.4)
61 61 tzinfo (~> 1.1)
62   - acts_as_list (0.7.4)
  62 + acts_as_list (0.7.5)
63 63 activerecord (>= 3.0)
64 64 acts_as_tree (2.4.0)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.3.2)
68   - aws-sdk-resources (= 2.3.2)
69   - aws-sdk-core (2.3.2)
  67 + aws-sdk (2.3.20)
  68 + aws-sdk-resources (= 2.3.20)
  69 + aws-sdk-core (2.3.20)
70 70 jmespath (~> 1.0)
71   - aws-sdk-resources (2.3.2)
72   - aws-sdk-core (= 2.3.2)
  71 + aws-sdk-resources (2.3.20)
  72 + aws-sdk-core (= 2.3.20)
73 73 backport_new_renderer (1.0.0)
74 74 rails
75 75 bcrypt (3.1.11)
... ... @@ -81,7 +81,7 @@ GEM
81 81 delayed_job_active_record (4.1.1)
82 82 activerecord (>= 3.0, < 5.1)
83 83 delayed_job (>= 3.0, < 5)
84   - devise (4.1.1)
  84 + devise (4.2.0)
85 85 bcrypt (~> 3.0)
86 86 orm_adapter (~> 0.1)
87 87 railties (>= 4.1.0, < 5.1)
... ... @@ -107,7 +107,7 @@ GEM
107 107 railties (>= 3.0, < 5.0)
108 108 thor (>= 0.14, < 2.0)
109 109 json (1.8.3)
110   - json_pure (1.8.3)
  110 + json_pure (2.0.1)
111 111 libv8 (3.16.14.15)
112 112 loofah (2.0.3)
113 113 nokogiri (>= 1.5.9)
... ... @@ -179,8 +179,8 @@ GEM
179 179 rspec-support (~> 3.4.0)
180 180 rspec-support (3.4.1)
181 181 sass (3.4.22)
182   - sass-rails (5.0.4)
183   - railties (>= 4.0.0, < 5.0)
  182 + sass-rails (5.0.5)
  183 + railties (>= 4.0.0, < 6)
184 184 sass (~> 3.1)
185 185 sprockets (>= 2.8, < 4.0)
186 186 sprockets-rails (>= 2.0, < 4.0)
... ... @@ -188,10 +188,10 @@ GEM
188 188 sdoc (0.4.1)
189 189 json (~> 1.7, >= 1.7.7)
190 190 rdoc (~> 4.0)
191   - sprockets (3.6.0)
  191 + sprockets (3.6.3)
192 192 concurrent-ruby (~> 1.0)
193 193 rack (> 1, < 3)
194   - sprockets-rails (3.0.4)
  194 + sprockets-rails (3.1.1)
195 195 actionpack (>= 4.0)
196 196 activesupport (>= 4.0)
197 197 sprockets (>= 3.0.0)
... ...
... ... @@ -34,4 +34,4 @@
34 34
35 35 //= require kanjai/admin/admin
36 36 //= require kanjai/admin/admin_extend
37   -//= require kanjai/admin/html_generator
\ No newline at end of file
  37 +//= require kanjai/admin/html_generator
... ...
... ... @@ -135,6 +135,10 @@ module Kanjai
135 135 else
136 136 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_not_login.js')}'></script>"
137 137 end
  138 + js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
  139 + css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
  140 + js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
  141 +
138 142 layer.gsub!(marker, js_array.join(''))
139 143 else
140 144 #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
... ...
... ... @@ -12,15 +12,17 @@ module Kanjai
12 12 private
13 13
14 14 def default_url_options(options={})
15   - if params[:locale] or @current_controller == 'pages'
  15 + if params && params[:locale] || @current_controller == 'pages'
16 16 { :locale => I18n.locale }
  17 + else
  18 + {}
17 19 end
18 20
19 21 end
20 22
21 23
22 24 def define_locale
23   - unless params[:locale].nil?
  25 + if params && params[:locale].present?
24 26 I18n.locale = params[:locale]
25 27 end
26 28 end
... ... @@ -28,6 +30,7 @@ module Kanjai
28 30
29 31 def get_page
30 32 @url = get_page_url
  33 + $original_fullpath = request.original_fullpath
31 34
32 35 #@page_data = PageDatum.where(:url => @url).first
33 36 #$current_locale = PageLang.where(default_use: true).first.code
... ...
... ... @@ -74,6 +74,8 @@ en:
74 74 show_more: "Show more"
75 75 close: Close
76 76 download: Download
  77 + edit: Edit
  78 + delete: Delete
77 79
78 80 admin:
79 81 login:
... ...
... ... @@ -14,7 +14,7 @@ module Kanjai
14 14 end
15 15
16 16 initializer "kanjai.assets.precompile" do |app|
17   - app.config.assets.precompile = %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js kanjai/frontend_not_login.js)
  17 + app.config.assets.precompile = %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/frontend_extend.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js kanjai/frontend_not_login.js kanjai/frontend_extend)
18 18 end
19 19
20 20
... ...