EDIT / kanjai · Commits

Commit 0d38497ac02615c416cb475786cb024326ced74a

Authored by Karpikau Andrei
1 parent cf0640df

add support pdf format

Inline Side-by-side
Showing 9 changed files with 368 additions and 258 deletions
... ... @@ -133,12 +133,12 @@
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.8.1, rbenv: 2.1.3) [gem]" level="application" />
  136 + <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.2, rbenv: 2.1.3) [gem]" level="application" />
137 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.5.1, 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.5.11, rbenv: 2.1.3) [gem]" level="application" />
140   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.5.11, rbenv: 2.1.3) [gem]" level="application" />
141   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.5.11, rbenv: 2.1.3) [gem]" level="application" />
  139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.5, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.5, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.5, rbenv: 2.1.3) [gem]" level="application" />
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" />
... ...
... ... @@ -25,109 +25,81 @@
25 25 </component>
26 26 <component name="FileEditorManager">
27 27 <leaf>
28   - <file leaf-file-name="structure.html.erb" pinned="false" current-in-tab="false">
29   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
  28 + <file leaf-file-name="zip.rb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/lib/zip.rb">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="675">
32   - <caret line="5" column="132" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="132" />
33   - <folding>
34   - <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
35   - </folding>
36   - </state>
37   - </provider>
38   - </entry>
39   - </file>
40   - <file leaf-file-name="show_editor.html.erb" pinned="false" current-in-tab="false">
41   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
42   - <provider selected="true" editor-type-id="text-editor">
43   - <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="615">
44   - <caret line="24" column="16" selection-start-line="0" selection-start-column="0" selection-end-line="35" selection-end-column="9" />
45   - <folding>
46   - <element signature="e#360#414#0#ruby" expanded="false" />
47   - <element signature="e#1122#1141#0#ruby" expanded="false" />
48   - <element signature="e#1197#1216#0#ruby" expanded="false" />
49   - </folding>
50   - </state>
51   - </provider>
52   - </entry>
53   - </file>
54   - <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
55   - <entry file="file://$PROJECT_DIR$/config/routes.rb">
56   - <provider selected="true" editor-type-id="text-editor">
57   - <state vertical-scroll-proportion="0.0" vertical-offset="353" max-vertical-offset="960">
58   - <caret line="49" column="26" selection-start-line="0" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
  31 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6495">
  32 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
59 33 <folding />
60 34 </state>
61 35 </provider>
62 36 </entry>
63 37 </file>
64   - <file leaf-file-name="html_generator.js" pinned="false" current-in-tab="false">
65   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  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">
66 40 <provider selected="true" editor-type-id="text-editor">
67   - <state vertical-scroll-proportion="0.0" vertical-offset="3188" max-vertical-offset="8550">
68   - <caret line="226" column="0" selection-start-line="226" selection-start-column="0" selection-end-line="232" selection-end-column="7" />
69   - <folding>
70   - <marker date="1470228118000" expanded="true" signature="503:515" placeholder="..." />
71   - </folding>
  41 + <state vertical-scroll-proportion="0.0" vertical-offset="1886" max-vertical-offset="2805">
  42 + <caret line="144" column="25" selection-start-line="144" selection-start-column="25" selection-end-line="144" selection-end-column="25" />
  43 + <folding />
72 44 </state>
73 45 </provider>
74 46 </entry>
75 47 </file>
76   - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
77   - <entry file="file://$PROJECT_DIR$/Gemfile">
  48 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  49 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
78 50 <provider selected="true" editor-type-id="text-editor">
79   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
80   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  51 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  52 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
81 53 <folding />
82 54 </state>
83 55 </provider>
84 56 </entry>
85 57 </file>
86   - <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
87   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  58 + <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
88 60 <provider selected="true" editor-type-id="text-editor">
89   - <state vertical-scroll-proportion="0.0" vertical-offset="218" max-vertical-offset="1140">
90   - <caret line="28" column="20" selection-start-line="28" selection-start-column="18" selection-end-line="28" selection-end-column="20" />
  61 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="180">
  62 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
91 63 <folding />
92 64 </state>
93 65 </provider>
94 66 </entry>
95 67 </file>
96   - <file leaf-file-name="application_helper.rb" pinned="false" current-in-tab="false">
97   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  68 + <file leaf-file-name="show.pdf.erb" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
98 70 <provider selected="true" editor-type-id="text-editor">
99   - <state vertical-scroll-proportion="0.0" vertical-offset="581" max-vertical-offset="1215">
100   - <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
  71 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
  72 + <caret line="0" column="26" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" />
101 73 <folding />
102 74 </state>
103 75 </provider>
104 76 </entry>
105 77 </file>
106   - <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="true">
107   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  78 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
108 80 <provider selected="true" editor-type-id="text-editor">
109   - <state vertical-scroll-proportion="0.6919275" vertical-offset="555" max-vertical-offset="2055">
110   - <caret line="65" column="42" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="401" max-vertical-offset="1035">
  82 + <caret line="31" column="25" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="25" />
111 83 <folding />
112 84 </state>
113 85 </provider>
114 86 </entry>
115 87 </file>
116   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
117   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  88 + <file leaf-file-name="content_function.rb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
118 90 <provider selected="true" editor-type-id="text-editor">
119   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
120   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  91 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="2520">
  92 + <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
121 93 <folding />
122 94 </state>
123 95 </provider>
124 96 </entry>
125 97 </file>
126   - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
127   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  98 + <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
128 100 <provider selected="true" editor-type-id="text-editor">
129   - <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">
130   - <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
  101 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  102 + <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
131 103 <folding />
132 104 </state>
133 105 </provider>
... ... @@ -138,10 +110,7 @@
138 110 <component name="IdeDocumentHistory">
139 111 <option name="CHANGED_PATHS">
140 112 <list>
141   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb" />
142   - <option value="$PROJECT_DIR$/public/test_template/index.html" />
143 113 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" />
144   - <option value="$PROJECT_DIR$/kanjai.gemspec" />
145 114 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
146 115 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
147 116 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
... ... @@ -160,9 +129,7 @@
160 129 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
161 130 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
162 131 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
163   - <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
164 132 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
165   - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
166 133 <option value="$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb" />
167 134 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
168 135 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css" />
... ... @@ -187,8 +154,13 @@
187 154 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb" />
188 155 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" />
189 156 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
190   - <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
191 157 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
  158 + <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
  159 + <option value="$PROJECT_DIR$/kanjai.gemspec" />
  160 + <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" />
  161 + <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" />
  162 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  163 + <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
192 164 </list>
193 165 </option>
194 166 </component>
... ... @@ -223,6 +195,8 @@
223 195 <sortByType />
224 196 </navigator>
225 197 <panes>
  198 + <pane id="RailsProjectView" />
  199 + <pane id="Scope" />
226 200 <pane id="ProjectPane">
227 201 <subPane>
228 202 <PATH>
... ... @@ -269,9 +243,77 @@
269 243 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
270 244 </PATH_ELEMENT>
271 245 <PATH_ELEMENT>
  246 + <option name="myItemId" value="tasks" />
  247 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  248 + </PATH_ELEMENT>
  249 + </PATH>
  250 + <PATH>
  251 + <PATH_ELEMENT>
  252 + <option name="myItemId" value="kanjai" />
  253 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  254 + </PATH_ELEMENT>
  255 + <PATH_ELEMENT>
  256 + <option name="myItemId" value="kanjai" />
  257 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  258 + </PATH_ELEMENT>
  259 + <PATH_ELEMENT>
  260 + <option name="myItemId" value="lib" />
  261 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  262 + </PATH_ELEMENT>
  263 + <PATH_ELEMENT>
  264 + <option name="myItemId" value="kanjai" />
  265 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  266 + </PATH_ELEMENT>
  267 + </PATH>
  268 + <PATH>
  269 + <PATH_ELEMENT>
  270 + <option name="myItemId" value="kanjai" />
  271 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  272 + </PATH_ELEMENT>
  273 + <PATH_ELEMENT>
  274 + <option name="myItemId" value="kanjai" />
  275 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  276 + </PATH_ELEMENT>
  277 + <PATH_ELEMENT>
  278 + <option name="myItemId" value="config" />
  279 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  280 + </PATH_ELEMENT>
  281 + </PATH>
  282 + <PATH>
  283 + <PATH_ELEMENT>
  284 + <option name="myItemId" value="kanjai" />
  285 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  286 + </PATH_ELEMENT>
  287 + <PATH_ELEMENT>
  288 + <option name="myItemId" value="kanjai" />
  289 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  290 + </PATH_ELEMENT>
  291 + <PATH_ELEMENT>
  292 + <option name="myItemId" value="config" />
  293 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  294 + </PATH_ELEMENT>
  295 + <PATH_ELEMENT>
  296 + <option name="myItemId" value="initializers" />
  297 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  298 + </PATH_ELEMENT>
  299 + </PATH>
  300 + <PATH>
  301 + <PATH_ELEMENT>
  302 + <option name="myItemId" value="kanjai" />
  303 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  304 + </PATH_ELEMENT>
  305 + <PATH_ELEMENT>
272 306 <option name="myItemId" value="kanjai" />
273 307 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
274 308 </PATH_ELEMENT>
  309 + <PATH_ELEMENT>
  310 + <option name="myItemId" value="app" />
  311 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  312 + </PATH_ELEMENT>
  313 + <PATH_ELEMENT>
  314 + <option name="myItemId" value="views" />
  315 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  316 + </PATH_ELEMENT>
275 317 </PATH>
276 318 <PATH>
277 319 <PATH_ELEMENT>
... ... @@ -286,6 +328,14 @@
286 328 <option name="myItemId" value="app" />
287 329 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
288 330 </PATH_ELEMENT>
  331 + <PATH_ELEMENT>
  332 + <option name="myItemId" value="views" />
  333 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  334 + </PATH_ELEMENT>
  335 + <PATH_ELEMENT>
  336 + <option name="myItemId" value="kanjai" />
  337 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  338 + </PATH_ELEMENT>
289 339 </PATH>
290 340 <PATH>
291 341 <PATH_ELEMENT>
... ... @@ -301,13 +351,31 @@
301 351 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
302 352 </PATH_ELEMENT>
303 353 <PATH_ELEMENT>
304   - <option name="myItemId" value="helpers" />
  354 + <option name="myItemId" value="views" />
  355 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  356 + </PATH_ELEMENT>
  357 + <PATH_ELEMENT>
  358 + <option name="myItemId" value="kanjai" />
  359 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  360 + </PATH_ELEMENT>
  361 + <PATH_ELEMENT>
  362 + <option name="myItemId" value="pages" />
305 363 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
306 364 </PATH_ELEMENT>
  365 + </PATH>
  366 + <PATH>
  367 + <PATH_ELEMENT>
  368 + <option name="myItemId" value="kanjai" />
  369 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  370 + </PATH_ELEMENT>
307 371 <PATH_ELEMENT>
308 372 <option name="myItemId" value="kanjai" />
309 373 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
310 374 </PATH_ELEMENT>
  375 + <PATH_ELEMENT>
  376 + <option name="myItemId" value="app" />
  377 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  378 + </PATH_ELEMENT>
311 379 </PATH>
312 380 <PATH>
313 381 <PATH_ELEMENT>
... ... @@ -323,22 +391,34 @@
323 391 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
324 392 </PATH_ELEMENT>
325 393 <PATH_ELEMENT>
326   - <option name="myItemId" value="helpers" />
  394 + <option name="myItemId" value="controllers" />
327 395 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
328 396 </PATH_ELEMENT>
329 397 <PATH_ELEMENT>
330 398 <option name="myItemId" value="kanjai" />
331 399 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
332 400 </PATH_ELEMENT>
  401 + </PATH>
  402 + <PATH>
  403 + <PATH_ELEMENT>
  404 + <option name="myItemId" value="kanjai" />
  405 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  406 + </PATH_ELEMENT>
  407 + <PATH_ELEMENT>
  408 + <option name="myItemId" value="kanjai" />
  409 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  410 + </PATH_ELEMENT>
333 411 <PATH_ELEMENT>
334   - <option name="myItemId" value="admin" />
  412 + <option name="myItemId" value="app" />
  413 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  414 + </PATH_ELEMENT>
  415 + <PATH_ELEMENT>
  416 + <option name="myItemId" value="assets" />
335 417 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
336 418 </PATH_ELEMENT>
337 419 </PATH>
338 420 </subPane>
339 421 </pane>
340   - <pane id="RailsProjectView" />
341   - <pane id="Scope" />
342 422 </panes>
343 423 </component>
344 424 <component name="PropertiesComponent">
... ... @@ -350,11 +430,11 @@
350 430 </component>
351 431 <component name="RecentsManager">
352 432 <key name="CopyFile.RECENT_KEYS">
  433 + <recent name="$PROJECT_DIR$/config/initializers" />
353 434 <recent name="$PROJECT_DIR$/bin" />
354 435 <recent name="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general" />
355 436 <recent name="$PROJECT_DIR$/app/assets/javascripts/kanjai/general" />
356 437 <recent name="$PROJECT_DIR$/lib" />
357   - <recent name="$PROJECT_DIR$/config/initializers" />
358 438 </key>
359 439 <key name="MoveFile.RECENT_KEYS">
360 440 <recent name="$PROJECT_DIR$/app/assets/images/kanjai/fileinput" />
... ... @@ -535,20 +615,20 @@
535 615 <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" />
536 616 <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" />
537 617 <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" />
538   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.43861067" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  618 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32229403" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  619 + <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" />
  620 + <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" />
539 621 <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" />
540 622 <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" />
541 623 <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" />
542 624 <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" />
543 625 <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" />
544   - <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" />
545 626 <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" />
546   - <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" />
  627 + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
547 628 <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" />
548 629 <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" />
549   - <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" />
550   - <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" />
551 630 <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" />
  631 + <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" />
552 632 </layout>
553 633 </component>
554 634 <component name="Vcs.Log.UiProperties">
... ... @@ -574,332 +654,317 @@
574 654 <watches-manager />
575 655 </component>
576 656 <component name="editorHistoryManager">
577   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/print_template.rb">
578   - <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" />
581   - </state>
582   - </provider>
583   - </entry>
584   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb">
  657 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
585 658 <provider selected="true" editor-type-id="text-editor">
586   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
587   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  659 + <state vertical-scroll-proportion="0.0" vertical-offset="807" max-vertical-offset="22110">
  660 + <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
588 661 </state>
589 662 </provider>
590 663 </entry>
591   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
  664 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
592 665 <provider selected="true" editor-type-id="text-editor">
593   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
594   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  666 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="315">
  667 + <caret line="0" column="42" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="42" />
595 668 </state>
596 669 </provider>
597 670 </entry>
598   - <entry file="file://$PROJECT_DIR$/app/views/devise/confirmations/new.html.erb">
  671 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb">
599 672 <provider selected="true" editor-type-id="text-editor">
600   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="375">
601   - <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
  673 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  674 + <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
602 675 </state>
603 676 </provider>
604 677 </entry>
605   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/fileinput.js">
  678 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
606 679 <provider selected="true" editor-type-id="text-editor">
607   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="49005">
  680 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
608 681 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
609 682 </state>
610 683 </provider>
611 684 </entry>
612   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
613   - <provider selected="true" editor-type-id="text-editor">
614   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="675">
615   - <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="28" />
616   - </state>
617   - </provider>
618   - </entry>
619   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
  685 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
620 686 <provider selected="true" editor-type-id="text-editor">
621   - <state vertical-scroll-proportion="0.45918366" vertical-offset="135" max-vertical-offset="660">
622   - <caret line="21" column="204" selection-start-line="21" selection-start-column="67" selection-end-line="21" selection-end-column="204" />
  687 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  688 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
623 689 </state>
624 690 </provider>
625 691 </entry>
626   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  692 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
627 693 <provider selected="true" editor-type-id="text-editor">
628   - <state vertical-scroll-proportion="-75.0" vertical-offset="0" max-vertical-offset="2520">
629   - <caret line="135" column="69" selection-start-line="135" selection-start-column="68" selection-end-line="135" selection-end-column="69" />
  694 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  695 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
630 696 </state>
631 697 </provider>
632 698 </entry>
633   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
  699 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
634 700 <provider selected="true" editor-type-id="text-editor">
635   - <state vertical-scroll-proportion="0.0" vertical-offset="1234" max-vertical-offset="1650">
636   - <caret line="100" column="144" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="144" />
  701 + <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
  702 + <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
637 703 </state>
638 704 </provider>
639 705 </entry>
640   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  706 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin_extend.css.scss">
641 707 <provider selected="true" editor-type-id="text-editor">
642   - <state vertical-scroll-proportion="0.0" vertical-offset="1025" max-vertical-offset="1770">
643   - <caret line="89" column="76" selection-start-line="89" selection-start-column="76" selection-end-line="89" selection-end-column="76" />
  708 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  709 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
644 710 </state>
645 711 </provider>
646 712 </entry>
647   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  713 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
648 714 <provider selected="true" editor-type-id="text-editor">
649   - <state vertical-scroll-proportion="0.56782335" vertical-offset="1485" max-vertical-offset="2925">
650   - <caret line="123" column="64" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="64" />
  715 + <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="390">
  716 + <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
651 717 </state>
652 718 </provider>
653 719 </entry>
654   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
  720 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
655 721 <provider selected="true" editor-type-id="text-editor">
656   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="5745">
657   - <caret line="280" column="0" selection-start-line="280" selection-start-column="0" selection-end-line="280" selection-end-column="0" />
  722 + <state vertical-scroll-proportion="0.0" vertical-offset="3765" max-vertical-offset="95070">
  723 + <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
658 724 </state>
659 725 </provider>
660 726 </entry>
661   - <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
  727 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
662 728 <provider selected="true" editor-type-id="text-editor">
663   - <state vertical-scroll-proportion="0.04731861" vertical-offset="0" max-vertical-offset="634">
664   - <caret line="2" column="73" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
  729 + <state vertical-scroll-proportion="0.0" vertical-offset="255" max-vertical-offset="360">
  730 + <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
665 731 </state>
666 732 </provider>
667 733 </entry>
668   - <entry file="file://$PROJECT_DIR$/db/migrate/20160804133136_add_image_link_to_kanjai_images.rb">
  734 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/applets.scss">
669 735 <provider selected="true" editor-type-id="text-editor">
670   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
671   - <caret line="2" column="51" selection-start-line="2" selection-start-column="51" selection-end-line="2" selection-end-column="51" />
  736 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  737 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
672 738 </state>
673 739 </provider>
674 740 </entry>
675   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/get_gallery.html.erb">
  741 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/config.scss">
676 742 <provider selected="true" editor-type-id="text-editor">
677   - <state vertical-scroll-proportion="-1.25" vertical-offset="0" max-vertical-offset="165">
678   - <caret line="2" column="242" selection-start-line="2" selection-start-column="242" selection-end-line="2" selection-end-column="242" />
  743 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  744 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
679 745 </state>
680 746 </provider>
681 747 </entry>
682   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
  748 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/bootstrap.js">
683 749 <provider selected="true" editor-type-id="text-editor">
684   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
685   - <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
  750 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="34905">
  751 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
686 752 </state>
687 753 </provider>
688 754 </entry>
689   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_contents_controller.rb">
  755 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
690 756 <provider selected="true" editor-type-id="text-editor">
691   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">
692   - <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="1366" max-vertical-offset="3420">
  758 + <caret line="103" column="30" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="30" />
693 759 </state>
694 760 </provider>
695 761 </entry>
696   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  762 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
697 763 <provider selected="true" editor-type-id="text-editor">
698   - <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="1485">
699   - <caret line="25" column="27" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="27" />
  764 + <state vertical-scroll-proportion="0.0" vertical-offset="585" max-vertical-offset="1380">
  765 + <caret line="56" column="10" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" />
700 766 </state>
701 767 </provider>
702 768 </entry>
703   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_gallery_exist_images.html.erb">
  769 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
704 770 <provider selected="true" editor-type-id="text-editor">
705   - <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="210">
706   - <caret line="8" column="9" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
  771 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="675">
  772 + <caret line="5" column="132" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="132" />
707 773 </state>
708 774 </provider>
709 775 </entry>
710   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/update_gallery.js.erb">
  776 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
711 777 <provider selected="true" editor-type-id="text-editor">
712   - <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="135">
713   - <caret line="1" column="61" selection-start-line="1" selection-start-column="61" selection-end-line="1" selection-end-column="61" />
  778 + <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="615">
  779 + <caret line="24" column="16" selection-start-line="0" selection-start-column="0" selection-end-line="35" selection-end-column="9" />
714 780 </state>
715 781 </provider>
716 782 </entry>
717   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/gallery.html.erb">
  783 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
718 784 <provider selected="true" editor-type-id="text-editor">
719   - <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="735">
720   - <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
  785 + <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">
  786 + <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
721 787 </state>
722 788 </provider>
723 789 </entry>
724   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
  790 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
725 791 <provider selected="true" editor-type-id="text-editor">
726   - <state vertical-scroll-proportion="0.0" vertical-offset="807" max-vertical-offset="22110">
727   - <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
  792 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
  793 + <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
728 794 </state>
729 795 </provider>
730 796 </entry>
731   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
  797 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
732 798 <provider selected="true" editor-type-id="text-editor">
733   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="315">
734   - <caret line="0" column="42" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="42" />
  799 + <state vertical-scroll-proportion="0.0" vertical-offset="975" max-vertical-offset="2055">
  800 + <caret line="65" column="42" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
735 801 </state>
736 802 </provider>
737 803 </entry>
738   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  804 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
739 805 <provider selected="true" editor-type-id="text-editor">
740   - <state vertical-scroll-proportion="0.0" vertical-offset="1778" max-vertical-offset="4635">
741   - <caret line="148" column="12" selection-start-line="148" selection-start-column="6" selection-end-line="148" selection-end-column="12" />
  806 + <state vertical-scroll-proportion="0.14195584" vertical-offset="435" max-vertical-offset="8550">
  807 + <caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
742 808 </state>
743 809 </provider>
744 810 </entry>
745   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb">
  811 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb">
746 812 <provider selected="true" editor-type-id="text-editor">
747   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
748   - <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
  813 + <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="345">
  814 + <caret line="11" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
749 815 </state>
750 816 </provider>
751 817 </entry>
752   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  818 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/_edit_resource_links.html.erb">
753 819 <provider selected="true" editor-type-id="text-editor">
754 820 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
755 821 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
756 822 </state>
757 823 </provider>
758 824 </entry>
759   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  825 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb">
760 826 <provider selected="true" editor-type-id="text-editor">
761 827 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
762 828 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
763 829 </state>
764 830 </provider>
765 831 </entry>
766   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  832 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/_form.html.erb">
767 833 <provider selected="true" editor-type-id="text-editor">
768   - <state vertical-scroll-proportion="0.0" vertical-offset="2919" max-vertical-offset="7845">
769   - <caret line="210" column="0" selection-start-line="210" selection-start-column="0" selection-end-line="210" selection-end-column="0" />
  834 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  835 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="6" />
770 836 </state>
771 837 </provider>
772 838 </entry>
773   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
  839 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb">
774 840 <provider selected="true" editor-type-id="text-editor">
775 841 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
776 842 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
777 843 </state>
778 844 </provider>
779 845 </entry>
780   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
  846 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
781 847 <provider selected="true" editor-type-id="text-editor">
782 848 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
783 849 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
784 850 </state>
785 851 </provider>
786 852 </entry>
787   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  853 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
788 854 <provider selected="true" editor-type-id="text-editor">
789   - <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
790   - <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
  855 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4635">
  856 + <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
791 857 </state>
792 858 </provider>
793 859 </entry>
794   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin_extend.css.scss">
  860 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
795 861 <provider selected="true" editor-type-id="text-editor">
796   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
797   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  862 + <state vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="7845">
  863 + <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="54" selection-end-column="1" />
798 864 </state>
799 865 </provider>
800 866 </entry>
801   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
  867 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
802 868 <provider selected="true" editor-type-id="text-editor">
803   - <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="390">
804   - <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
  869 + <state vertical-scroll-proportion="0.0" vertical-offset="110" max-vertical-offset="660">
  870 + <caret line="26" column="19" selection-start-line="22" selection-start-column="0" selection-end-line="26" selection-end-column="19" />
  871 + <folding />
805 872 </state>
806 873 </provider>
807 874 </entry>
808   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  875 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
809 876 <provider selected="true" editor-type-id="text-editor">
810   - <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="2685">
811   - <caret line="34" column="95" selection-start-line="34" selection-start-column="12" selection-end-line="34" selection-end-column="95" />
  877 + <state vertical-scroll-proportion="0.0" vertical-offset="1234" max-vertical-offset="1650">
  878 + <caret line="92" column="0" selection-start-line="92" selection-start-column="0" selection-end-line="96" selection-end-column="7" />
  879 + <folding />
812 880 </state>
813 881 </provider>
814 882 </entry>
815   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
  883 + <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
816 884 <provider selected="true" editor-type-id="text-editor">
817   - <state vertical-scroll-proportion="0.0" vertical-offset="3765" max-vertical-offset="95070">
818   - <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
  885 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
  886 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  887 + <folding />
819 888 </state>
820 889 </provider>
821 890 </entry>
822   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
  891 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
823 892 <provider selected="true" editor-type-id="text-editor">
824   - <state vertical-scroll-proportion="0.0" vertical-offset="255" max-vertical-offset="360">
825   - <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
  893 + <state vertical-scroll-proportion="0.0" vertical-offset="615" max-vertical-offset="2925">
  894 + <caret line="41" column="25" selection-start-line="41" selection-start-column="22" selection-end-line="41" selection-end-column="25" />
  895 + <folding />
826 896 </state>
827 897 </provider>
828 898 </entry>
829   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/applets.scss">
  899 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
830 900 <provider selected="true" editor-type-id="text-editor">
831   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  901 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
832 902 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  903 + <folding />
833 904 </state>
834 905 </provider>
835 906 </entry>
836   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/config.scss">
  907 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
837 908 <provider selected="true" editor-type-id="text-editor">
838   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  909 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
839 910 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  911 + <folding />
840 912 </state>
841 913 </provider>
842 914 </entry>
843   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/bootstrap.js">
  915 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
844 916 <provider selected="true" editor-type-id="text-editor">
845   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="34905">
  917 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
846 918 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  919 + <folding />
847 920 </state>
848 921 </provider>
849 922 </entry>
850   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
  923 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
851 924 <provider selected="true" editor-type-id="text-editor">
852   - <state vertical-scroll-proportion="0.0" vertical-offset="1366" max-vertical-offset="3420">
853   - <caret line="103" column="30" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="30" />
  925 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4110">
  926 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
854 927 <folding />
855 928 </state>
856 929 </provider>
857 930 </entry>
858   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
  931 + <entry file="file://$PROJECT_DIR$/lib/zip.rb">
859 932 <provider selected="true" editor-type-id="text-editor">
860   - <state vertical-scroll-proportion="0.0" vertical-offset="585" max-vertical-offset="1380">
861   - <caret line="56" column="10" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" />
  933 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6495">
  934 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
862 935 <folding />
863 936 </state>
864 937 </provider>
865 938 </entry>
866   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
  939 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
867 940 <provider selected="true" editor-type-id="text-editor">
868   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="675">
869   - <caret line="5" column="132" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="132" />
870   - <folding>
871   - <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
872   - </folding>
  941 + <state vertical-scroll-proportion="0.0" vertical-offset="303" max-vertical-offset="960">
  942 + <caret line="55" column="16" selection-start-line="55" selection-start-column="12" selection-end-line="55" selection-end-column="16" />
  943 + <folding />
873 944 </state>
874 945 </provider>
875 946 </entry>
876   - <entry file="file://$PROJECT_DIR$/config/routes.rb">
  947 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
877 948 <provider selected="true" editor-type-id="text-editor">
878   - <state vertical-scroll-proportion="0.0" vertical-offset="353" max-vertical-offset="960">
879   - <caret line="49" column="26" selection-start-line="0" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
  949 + <state vertical-scroll-proportion="0.26025236" vertical-offset="0" max-vertical-offset="634">
  950 + <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
880 951 <folding />
881 952 </state>
882 953 </provider>
883 954 </entry>
884   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
  955 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
885 956 <provider selected="true" editor-type-id="text-editor">
886   - <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="615">
887   - <caret line="24" column="16" selection-start-line="0" selection-start-column="0" selection-end-line="35" selection-end-column="9" />
888   - <folding>
889   - <element signature="e#360#414#0#ruby" expanded="false" />
890   - <element signature="e#1122#1141#0#ruby" expanded="false" />
891   - <element signature="e#1197#1216#0#ruby" expanded="false" />
892   - </folding>
  957 + <state vertical-scroll-proportion="0.0" vertical-offset="476" max-vertical-offset="1125">
  958 + <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />
  959 + <folding />
893 960 </state>
894 961 </provider>
895 962 </entry>
896   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  963 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
897 964 <provider selected="true" editor-type-id="text-editor">
898   - <state vertical-scroll-proportion="0.0" vertical-offset="3188" max-vertical-offset="8550">
899   - <caret line="226" column="0" selection-start-line="226" selection-start-column="0" selection-end-line="232" selection-end-column="7" />
900   - <folding>
901   - <marker date="1470228118000" expanded="true" signature="503:515" placeholder="..." />
902   - </folding>
  965 + <state vertical-scroll-proportion="0.0" vertical-offset="401" max-vertical-offset="1035">
  966 + <caret line="31" column="25" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="25" />
  967 + <folding />
903 968 </state>
904 969 </provider>
905 970 </entry>
... ... @@ -911,42 +976,58 @@
911 976 </state>
912 977 </provider>
913 978 </entry>
914   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  979 + <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb">
915 980 <provider selected="true" editor-type-id="text-editor">
916   - <state vertical-scroll-proportion="0.0" vertical-offset="218" max-vertical-offset="1140">
917   - <caret line="28" column="20" selection-start-line="28" selection-start-column="18" selection-end-line="28" selection-end-column="20" />
  981 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  982 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
918 983 <folding />
919 984 </state>
920 985 </provider>
921 986 </entry>
922   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  987 + <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
923 988 <provider selected="true" editor-type-id="text-editor">
924   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
925   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  989 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="2520">
  990 + <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" />
926 991 <folding />
927 992 </state>
928 993 </provider>
929 994 </entry>
930   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  995 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
931 996 <provider selected="true" editor-type-id="text-editor">
932   - <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">
933   - <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
  997 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  998 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
934 999 <folding />
935 1000 </state>
936 1001 </provider>
937 1002 </entry>
938   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  1003 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
939 1004 <provider selected="true" editor-type-id="text-editor">
940   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
941   - <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
  1005 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
  1006 + <caret line="0" column="26" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" />
942 1007 <folding />
943 1008 </state>
944 1009 </provider>
945 1010 </entry>
946   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  1011 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
947 1012 <provider selected="true" editor-type-id="text-editor">
948   - <state vertical-scroll-proportion="0.6919275" vertical-offset="555" max-vertical-offset="2055">
949   - <caret line="65" column="42" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
  1013 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  1014 + <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  1015 + <folding />
  1016 + </state>
  1017 + </provider>
  1018 + </entry>
  1019 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1020 + <provider selected="true" editor-type-id="text-editor">
  1021 + <state vertical-scroll-proportion="0.0" vertical-offset="1886" max-vertical-offset="2805">
  1022 + <caret line="144" column="25" selection-start-line="144" selection-start-column="25" selection-end-line="144" selection-end-column="25" />
  1023 + <folding />
  1024 + </state>
  1025 + </provider>
  1026 + </entry>
  1027 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  1028 + <provider selected="true" editor-type-id="text-editor">
  1029 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  1030 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
950 1031 <folding />
951 1032 </state>
952 1033 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.59)
  4 + kanjai (0.0.60)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -64,12 +64,12 @@ GEM
64 64 acts_as_tree (2.5.1)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.5.11)
68   - aws-sdk-resources (= 2.5.11)
69   - aws-sdk-core (2.5.11)
  67 + aws-sdk (2.6.5)
  68 + aws-sdk-resources (= 2.6.5)
  69 + aws-sdk-core (2.6.5)
70 70 jmespath (~> 1.0)
71   - aws-sdk-resources (2.5.11)
72   - aws-sdk-core (= 2.5.11)
  71 + aws-sdk-resources (2.6.5)
  72 + aws-sdk-core (= 2.6.5)
73 73 backport_new_renderer (1.0.0)
74 74 rails
75 75 bcrypt (3.1.11)
... ...
... ... @@ -29,7 +29,14 @@ module Kanjai
29 29 if current_admin_user || @page_data.page.private_flag == true || use_cache == false
30 30 layer = @page_data.page.page_template.get_html_content
31 31 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
32   - render :text => content_for_render and return
  32 +
  33 + @pdf_content = content_for_render
  34 + respond_to do |format|
  35 + format.html{render :text => content_for_render}
  36 + format.pdf{render pdf: "file_name", print_media_type: true}
  37 + end
  38 +
  39 + #render :text => content_for_render and return
33 40 else
34 41 #if stale?(@page_data, public: false)
35 42 if stale?(last_modified: @page_data.last_modified, etag: @page_data.etag_cache_key)
... ... @@ -136,17 +143,18 @@ module Kanjai
136 143 layer.gsub!(marker, $scheme + ADMIN_CONFIG['domain_name'])
137 144 when '###INCLUDE_JS_FILE###'
138 145 js_array = []
139   - if current_admin_user
140   - js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>"
141   - css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.css')}"
  146 + if params[:format].to_s != 'pdf'
  147 + if current_admin_user
  148 + js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>"
  149 + css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.css')}"
  150 + js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
  151 + else
  152 + js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_not_login.js')}'></script>"
  153 + end
  154 + js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
  155 + css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
142 156 js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
143   - else
144   - js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_not_login.js')}'></script>"
145 157 end
146   - js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
147   - css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
148   - js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
149   -
150 158 layer.gsub!(marker, js_array.join(''))
151 159 else
152 160 #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
... ...
  1 +<%= @pdf_content.html_safe %>
\ No newline at end of file
... ...
  1 +# WickedPDF Global Configuration
  2 +#
  3 +# Use this to set up shared configuration options for your entire application.
  4 +# Any of the configuration options shown here can also be applied to single
  5 +# models by passing arguments to the `render :pdf` call.
  6 +#
  7 +# To learn more, check out the README:
  8 +#
  9 +# https://github.com/mileszs/wicked_pdf/blob/master/README.md
  10 +
  11 +WickedPdf.config = {
  12 + # Path to the wkhtmltopdf executable: This usually isn't needed if using
  13 + # one of the wkhtmltopdf-binary family of gems.
  14 + # exe_path: '/usr/local/bin/wkhtmltopdf',
  15 + # or
  16 + # exe_path: Gem.bin_path('wkhtmltopdf-binary', 'wkhtmltopdf')
  17 +
  18 + # Layout file to be used for all PDFs
  19 + # (but can be overridden in `render :pdf` calls)
  20 + #layout: 'pdf.html',
  21 +}
... ...
... ... @@ -66,5 +66,4 @@ Gem::Specification.new do |s|
66 66
67 67 s.add_runtime_dependency 'rails_12factor'
68 68
69   -
70 69 end
... ...
... ... @@ -4,7 +4,7 @@ module Kanjai
4 4 def get_page_url
5 5 url = ''
6 6 req_url = request.original_fullpath if req_url.blank?
7   -
  7 + req_url = req_url.split('.')[0]
8 8
9 9 if req_url.split('?').length > 1
10 10 req_url = req_url.split('?')[0]
... ...
1 1 module Kanjai
2   - VERSION = "0.0.60"
  2 + VERSION = "0.0.61"
3 3 end
... ...