EDIT / kanjai · Commits

Commit b365020f05ed934dc0499ce299b136f4094df165

Authored by Karpikau Andrei
1 parent 4b1bb391

for pdf include frontent extend file

Inline Side-by-side
Showing 5 changed files with 123 additions and 185 deletions
... ... @@ -140,10 +140,10 @@
140 140 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
141 141 <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.0, rbenv: 2.1.3) [gem]" level="application" />
142 142 <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.5, rbenv: 2.1.3) [gem]" level="application" />
143   - <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
  143 + <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.6, rbenv: 2.1.3) [gem]" level="application" />
144 144 <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.3, rbenv: 2.1.3) [gem]" level="application" />
145 145 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.2, rbenv: 2.1.3) [gem]" level="application" />
146   - <orderEntry type="library" scope="PROVIDED" name="devise (v4.3.0, rbenv: 2.1.3) [gem]" level="application" />
  146 + <orderEntry type="library" scope="PROVIDED" name="devise (v4.4.0, rbenv: 2.1.3) [gem]" level="application" />
147 147 <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.2.5, rbenv: 2.1.3) [gem]" level="application" />
148 148 <orderEntry type="library" scope="PROVIDED" name="erubis (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
149 149 <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -198,7 +198,7 @@
198 198 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" />
199 199 <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.8, rbenv: 2.1.3) [gem]" level="application" />
200 200 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" />
201   - <orderEntry type="library" scope="PROVIDED" name="uglifier (v4.0.2, rbenv: 2.1.3) [gem]" level="application" />
  201 + <orderEntry type="library" scope="PROVIDED" name="uglifier (v4.1.3, rbenv: 2.1.3) [gem]" level="application" />
202 202 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.7, rbenv: 2.1.3) [gem]" level="application" />
203 203 </component>
204 204 <component name="RModuleSettingsStorage">
... ...
... ... @@ -2,9 +2,10 @@
2 2 <project version="4">
3 3 <component name="ChangeListManager">
4 4 <list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="">
  5 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/kanjai.iml" afterPath="$PROJECT_DIR$/.idea/kanjai.iml" />
  6 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
5 7 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Gemfile.lock" afterPath="$PROJECT_DIR$/Gemfile.lock" />
6 8 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" afterPath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
7   - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/models/kanjai/page_template.rb" afterPath="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
8 9 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" />
9 10 </list>
10 11 <ignored path="kanjai.iws" />
... ... @@ -27,20 +28,20 @@
27 28 <component name="FileEditorManager">
28 29 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
29 30 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
30   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  31 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
31 32 <provider selected="true" editor-type-id="text-editor">
32   - <state relative-caret-position="353">
33   - <caret line="90" column="10" lean-forward="false" selection-start-line="90" selection-start-column="10" selection-end-line="90" selection-end-column="10" />
  33 + <state relative-caret-position="413">
  34 + <caret line="178" column="10" lean-forward="false" selection-start-line="178" selection-start-column="10" selection-end-line="178" selection-end-column="10" />
34 35 <folding />
35 36 </state>
36 37 </provider>
37 38 </entry>
38 39 </file>
39   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
40   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  40 + <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
  41 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
41 42 <provider selected="true" editor-type-id="text-editor">
42   - <state relative-caret-position="214">
43   - <caret line="30" column="66" lean-forward="false" selection-start-line="30" selection-start-column="50" selection-end-line="30" selection-end-column="66" />
  43 + <state relative-caret-position="165">
  44 + <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
44 45 <folding />
45 46 </state>
46 47 </provider>
... ... @@ -49,7 +50,7 @@
49 50 <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
50 51 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
51 52 <provider selected="true" editor-type-id="text-editor">
52   - <state relative-caret-position="503">
  53 + <state relative-caret-position="2535">
53 54 <caret line="169" column="15" lean-forward="false" selection-start-line="169" selection-start-column="15" selection-end-line="169" selection-end-column="15" />
54 55 <folding />
55 56 </state>
... ... @@ -66,61 +67,61 @@
66 67 </provider>
67 68 </entry>
68 69 </file>
69   - <file leaf-file-name="rails.js" pinned="false" current-in-tab="false">
70   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
  70 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  71 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
71 72 <provider selected="true" editor-type-id="text-editor">
72   - <state relative-caret-position="464">
73   - <caret line="434" column="34" lean-forward="false" selection-start-line="434" selection-start-column="22" selection-end-line="434" selection-end-column="34" />
  73 + <state relative-caret-position="15">
  74 + <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
74 75 <folding />
75 76 </state>
76 77 </provider>
77 78 </entry>
78 79 </file>
79   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
80   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  80 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  81 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
81 82 <provider selected="true" editor-type-id="text-editor">
82   - <state relative-caret-position="15">
83   - <caret line="1" column="19" lean-forward="false" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  83 + <state relative-caret-position="555">
  84 + <caret line="37" column="17" lean-forward="false" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="17" />
84 85 <folding />
85 86 </state>
86 87 </provider>
87 88 </entry>
88 89 </file>
89   - <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
90   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  90 + <file leaf-file-name="wicked_pdf.rb" pinned="false" current-in-tab="false">
  91 + <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb">
91 92 <provider selected="true" editor-type-id="text-editor">
92   - <state relative-caret-position="465">
93   - <caret line="31" column="0" lean-forward="false" selection-start-line="31" selection-start-column="0" selection-end-line="31" selection-end-column="42" />
  93 + <state relative-caret-position="150">
  94 + <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="6" />
94 95 <folding />
95 96 </state>
96 97 </provider>
97 98 </entry>
98 99 </file>
99   - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
100   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  100 + <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">
  101 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
101 102 <provider selected="true" editor-type-id="text-editor">
102   - <state relative-caret-position="465">
103   - <caret line="151" column="56" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="56" />
  103 + <state relative-caret-position="0">
  104 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
104 105 <folding />
105 106 </state>
106 107 </provider>
107 108 </entry>
108 109 </file>
109   - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
110   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  110 + <file leaf-file-name="application.html.erb" pinned="false" current-in-tab="false">
  111 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
111 112 <provider selected="true" editor-type-id="text-editor">
112   - <state relative-caret-position="203">
113   - <caret line="37" column="17" lean-forward="false" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="17" />
  113 + <state relative-caret-position="0">
  114 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
114 115 <folding />
115 116 </state>
116 117 </provider>
117 118 </entry>
118 119 </file>
119   - <file leaf-file-name="admin_controller.rb" pinned="false" current-in-tab="false">
120   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  120 + <file leaf-file-name="admin_login.html.erb" pinned="false" current-in-tab="false">
  121 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
121 122 <provider selected="true" editor-type-id="text-editor">
122   - <state relative-caret-position="225">
123   - <caret line="15" column="6" lean-forward="false" selection-start-line="15" selection-start-column="6" selection-end-line="15" selection-end-column="23" />
  123 + <state relative-caret-position="0">
  124 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
124 125 <folding />
125 126 </state>
126 127 </provider>
... ... @@ -130,7 +131,6 @@
130 131 </component>
131 132 <component name="FindInProjectRecents">
132 133 <findStrings>
133   - <find>page_template.rb</find>
134 134 <find>edit_template</find>
135 135 <find>page_content_markers</find>
136 136 <find>replace_text_marker</find>
... ... @@ -153,10 +153,18 @@
153 153 <find>$current_locale</find>
154 154 <find>@page_data</find>
155 155 <find>get_html_content</find>
  156 + <find>@@permissions</find>
  157 + <find>c</find>
  158 + <find>ce</find>
  159 + <find>che</find>
  160 + <find>check_p</find>
  161 + <find>check_permission</find>
  162 + <find>admin_email</find>
  163 + <find>INCLUDE_JS_FILE</find>
156 164 </findStrings>
157 165 <dirStrings>
158   - <dir>$PROJECT_DIR$</dir>
159 166 <dir>$PROJECT_DIR$/app/controllers</dir>
  167 + <dir>$PROJECT_DIR$</dir>
160 168 </dirStrings>
161 169 </component>
162 170 <component name="Git.Settings">
... ... @@ -213,8 +221,8 @@
213 221 <option value="$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb" />
214 222 <option value="$PROJECT_DIR$/kanjai.gemspec" />
215 223 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
216   - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
217 224 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
  225 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
218 226 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
219 227 </list>
220 228 </option>
... ... @@ -228,7 +236,7 @@
228 236 <component name="ProjectFrameBounds">
229 237 <option name="y" value="23" />
230 238 <option name="width" value="1280" />
231   - <option name="height" value="729" />
  239 + <option name="height" value="728" />
232 240 </component>
233 241 <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
234 242 <component name="ProjectView">
... ... @@ -246,9 +254,6 @@
246 254 <foldersAlwaysOnTop value="true" />
247 255 </navigator>
248 256 <panes>
249   - <pane id="Scope" />
250   - <pane id="Scratches" />
251   - <pane id="RailsProjectView" />
252 257 <pane id="ProjectPane">
253 258 <subPane>
254 259 <PATH>
... ... @@ -289,24 +294,6 @@
289 294 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
290 295 </PATH_ELEMENT>
291 296 <PATH_ELEMENT>
292   - <option name="myItemId" value="tasks" />
293   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
294   - </PATH_ELEMENT>
295   - </PATH>
296   - <PATH>
297   - <PATH_ELEMENT>
298   - <option name="myItemId" value="kanjai" />
299   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
300   - </PATH_ELEMENT>
301   - <PATH_ELEMENT>
302   - <option name="myItemId" value="kanjai" />
303   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
304   - </PATH_ELEMENT>
305   - <PATH_ELEMENT>
306   - <option name="myItemId" value="lib" />
307   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
308   - </PATH_ELEMENT>
309   - <PATH_ELEMENT>
310 297 <option name="myItemId" value="kanjai" />
311 298 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
312 299 </PATH_ELEMENT>
... ... @@ -324,32 +311,6 @@
324 311 <option name="myItemId" value="app" />
325 312 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
326 313 </PATH_ELEMENT>
327   - <PATH_ELEMENT>
328   - <option name="myItemId" value="views" />
329   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
330   - </PATH_ELEMENT>
331   - </PATH>
332   - <PATH>
333   - <PATH_ELEMENT>
334   - <option name="myItemId" value="kanjai" />
335   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
336   - </PATH_ELEMENT>
337   - <PATH_ELEMENT>
338   - <option name="myItemId" value="kanjai" />
339   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
340   - </PATH_ELEMENT>
341   - <PATH_ELEMENT>
342   - <option name="myItemId" value="app" />
343   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
344   - </PATH_ELEMENT>
345   - <PATH_ELEMENT>
346   - <option name="myItemId" value="models" />
347   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
348   - </PATH_ELEMENT>
349   - <PATH_ELEMENT>
350   - <option name="myItemId" value="kanjai" />
351   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
352   - </PATH_ELEMENT>
353 314 </PATH>
354 315 <PATH>
355 316 <PATH_ELEMENT>
... ... @@ -427,38 +388,15 @@
427 388 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
428 389 </PATH_ELEMENT>
429 390 <PATH_ELEMENT>
430   - <option name="myItemId" value="controllers" />
431   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
432   - </PATH_ELEMENT>
433   - <PATH_ELEMENT>
434   - <option name="myItemId" value="kanjai" />
435   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
436   - </PATH_ELEMENT>
437   - <PATH_ELEMENT>
438   - <option name="myItemId" value="admin" />
439   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
440   - </PATH_ELEMENT>
441   - </PATH>
442   - <PATH>
443   - <PATH_ELEMENT>
444   - <option name="myItemId" value="kanjai" />
445   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
446   - </PATH_ELEMENT>
447   - <PATH_ELEMENT>
448   - <option name="myItemId" value="kanjai" />
449   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
450   - </PATH_ELEMENT>
451   - <PATH_ELEMENT>
452   - <option name="myItemId" value="app" />
453   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
454   - </PATH_ELEMENT>
455   - <PATH_ELEMENT>
456 391 <option name="myItemId" value="assets" />
457 392 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
458 393 </PATH_ELEMENT>
459 394 </PATH>
460 395 </subPane>
461 396 </pane>
  397 + <pane id="Scope" />
  398 + <pane id="RailsProjectView" />
  399 + <pane id="Scratches" />
462 400 </panes>
463 401 </component>
464 402 <component name="PropertiesComponent">
... ... @@ -717,18 +655,20 @@
717 655 <workItem from="1501482504677" duration="10000" />
718 656 <workItem from="1513232887722" duration="10776000" />
719 657 <workItem from="1513283335284" duration="121000" />
720   - <workItem from="1513543303254" duration="6908000" />
  658 + <workItem from="1513543303254" duration="7193000" />
  659 + <workItem from="1516654861781" duration="654000" />
  660 + <workItem from="1519076359527" duration="2873000" />
721 661 </task>
722 662 <servers />
723 663 </component>
724 664 <component name="TimeTrackingManager">
725   - <option name="totallyTimeSpent" value="21618000" />
  665 + <option name="totallyTimeSpent" value="25430000" />
726 666 </component>
727 667 <component name="ToolWindowManager">
728   - <frame x="0" y="23" width="1280" height="729" extended-state="6" />
  668 + <frame x="0" y="23" width="1280" height="728" extended-state="6" />
729 669 <editor active="true" />
730 670 <layout>
731   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.4628433" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  671 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.47738287" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
732 672 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
733 673 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
734 674 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
... ... @@ -771,41 +711,6 @@
771 711 <watches-manager />
772 712 </component>
773 713 <component name="editorHistoryManager">
774   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb">
775   - <provider selected="true" editor-type-id="text-editor">
776   - <state relative-caret-position="0">
777   - <caret line="40" column="7" lean-forward="false" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
778   - </state>
779   - </provider>
780   - </entry>
781   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">
782   - <provider selected="true" editor-type-id="text-editor">
783   - <state relative-caret-position="0">
784   - <caret line="8" column="102" lean-forward="false" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />
785   - </state>
786   - </provider>
787   - </entry>
788   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
789   - <provider selected="true" editor-type-id="text-editor">
790   - <state relative-caret-position="0">
791   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
792   - </state>
793   - </provider>
794   - </entry>
795   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
796   - <provider selected="true" editor-type-id="text-editor">
797   - <state relative-caret-position="0">
798   - <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
799   - </state>
800   - </provider>
801   - </entry>
802   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
803   - <provider selected="true" editor-type-id="text-editor">
804   - <state relative-caret-position="0">
805   - <caret line="21" column="205" lean-forward="false" selection-start-line="21" selection-start-column="67" selection-end-line="21" selection-end-column="205" />
806   - </state>
807   - </provider>
808   - </entry>
809 714 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
810 715 <provider selected="true" editor-type-id="text-editor">
811 716 <state relative-caret-position="0">
... ... @@ -1000,7 +905,6 @@
1000 905 <provider selected="true" editor-type-id="text-editor">
1001 906 <state relative-caret-position="705">
1002 907 <caret line="47" column="37" lean-forward="false" selection-start-line="47" selection-start-column="37" selection-end-line="47" selection-end-column="37" />
1003   - <folding />
1004 908 </state>
1005 909 </provider>
1006 910 </entry>
... ... @@ -1008,7 +912,6 @@
1008 912 <provider selected="true" editor-type-id="text-editor">
1009 913 <state relative-caret-position="675">
1010 914 <caret line="45" column="82" lean-forward="false" selection-start-line="45" selection-start-column="82" selection-end-line="45" selection-end-column="82" />
1011   - <folding />
1012 915 </state>
1013 916 </provider>
1014 917 </entry>
... ... @@ -1016,7 +919,6 @@
1016 919 <provider selected="true" editor-type-id="text-editor">
1017 920 <state relative-caret-position="0">
1018 921 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1019   - <folding />
1020 922 </state>
1021 923 </provider>
1022 924 </entry>
... ... @@ -1024,7 +926,6 @@
1024 926 <provider selected="true" editor-type-id="text-editor">
1025 927 <state relative-caret-position="1005">
1026 928 <caret line="67" column="11" lean-forward="false" selection-start-line="67" selection-start-column="11" selection-end-line="67" selection-end-column="11" />
1027   - <folding />
1028 929 </state>
1029 930 </provider>
1030 931 </entry>
... ... @@ -1032,7 +933,6 @@
1032 933 <provider selected="true" editor-type-id="text-editor">
1033 934 <state relative-caret-position="0">
1034 935 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1035   - <folding />
1036 936 </state>
1037 937 </provider>
1038 938 </entry>
... ... @@ -1040,7 +940,6 @@
1040 940 <provider selected="true" editor-type-id="text-editor">
1041 941 <state relative-caret-position="90">
1042 942 <caret line="6" column="0" lean-forward="false" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
1043   - <folding />
1044 943 </state>
1045 944 </provider>
1046 945 </entry>
... ... @@ -1052,25 +951,16 @@
1052 951 </state>
1053 952 </provider>
1054 953 </entry>
1055   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
1056   - <provider selected="true" editor-type-id="text-editor">
1057   - <state relative-caret-position="165">
1058   - <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
1059   - <folding />
1060   - </state>
1061   - </provider>
1062   - </entry>
1063 954 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/form_controller.rb">
1064 955 <provider selected="true" editor-type-id="text-editor">
1065 956 <state relative-caret-position="135">
1066 957 <caret line="9" column="32" lean-forward="false" selection-start-line="9" selection-start-column="32" selection-end-line="9" selection-end-column="32" />
1067   - <folding />
1068 958 </state>
1069 959 </provider>
1070 960 </entry>
1071 961 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
1072 962 <provider selected="true" editor-type-id="text-editor">
1073   - <state relative-caret-position="464">
  963 + <state relative-caret-position="6510">
1074 964 <caret line="434" column="34" lean-forward="false" selection-start-line="434" selection-start-column="22" selection-end-line="434" selection-end-column="34" />
1075 965 <folding />
1076 966 </state>
... ... @@ -1094,29 +984,61 @@
1094 984 </entry>
1095 985 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
1096 986 <provider selected="true" editor-type-id="text-editor">
1097   - <state relative-caret-position="353">
  987 + <state relative-caret-position="1350">
1098 988 <caret line="90" column="10" lean-forward="false" selection-start-line="90" selection-start-column="10" selection-end-line="90" selection-end-column="10" />
1099 989 <folding />
1100 990 </state>
1101 991 </provider>
1102 992 </entry>
  993 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  994 + <provider selected="true" editor-type-id="text-editor">
  995 + <state relative-caret-position="2265">
  996 + <caret line="151" column="56" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="56" />
  997 + <folding />
  998 + </state>
  999 + </provider>
  1000 + </entry>
  1001 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
  1002 + <provider selected="true" editor-type-id="text-editor">
  1003 + <state relative-caret-position="0">
  1004 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1005 + <folding />
  1006 + </state>
  1007 + </provider>
  1008 + </entry>
  1009 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  1010 + <provider selected="true" editor-type-id="text-editor">
  1011 + <state relative-caret-position="2535">
  1012 + <caret line="169" column="15" lean-forward="false" selection-start-line="169" selection-start-column="15" selection-end-line="169" selection-end-column="15" />
  1013 + <folding />
  1014 + </state>
  1015 + </provider>
  1016 + </entry>
  1017 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  1018 + <provider selected="true" editor-type-id="text-editor">
  1019 + <state relative-caret-position="0">
  1020 + <caret line="0" column="12" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
  1021 + <folding />
  1022 + </state>
  1023 + </provider>
  1024 + </entry>
1103 1025 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
1104 1026 <provider selected="true" editor-type-id="text-editor">
1105   - <state relative-caret-position="203">
  1027 + <state relative-caret-position="555">
1106 1028 <caret line="37" column="17" lean-forward="false" selection-start-line="37" selection-start-column="7" selection-end-line="37" selection-end-column="17" />
1107 1029 <folding />
1108 1030 </state>
1109 1031 </provider>
1110 1032 </entry>
1111   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  1033 + <entry file="file://$PROJECT_DIR$/config/initializers/wicked_pdf.rb">
1112 1034 <provider selected="true" editor-type-id="text-editor">
1113   - <state relative-caret-position="465">
1114   - <caret line="151" column="56" lean-forward="false" selection-start-line="151" selection-start-column="41" selection-end-line="151" selection-end-column="56" />
  1035 + <state relative-caret-position="150">
  1036 + <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="6" />
1115 1037 <folding />
1116 1038 </state>
1117 1039 </provider>
1118 1040 </entry>
1119   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
  1041 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
1120 1042 <provider selected="true" editor-type-id="text-editor">
1121 1043 <state relative-caret-position="0">
1122 1044 <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
... ... @@ -1124,18 +1046,34 @@
1124 1046 </state>
1125 1047 </provider>
1126 1048 </entry>
1127   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1049 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
1128 1050 <provider selected="true" editor-type-id="text-editor">
1129   - <state relative-caret-position="214">
1130   - <caret line="30" column="66" lean-forward="false" selection-start-line="30" selection-start-column="50" selection-end-line="30" selection-end-column="66" />
  1051 + <state relative-caret-position="0">
  1052 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1131 1053 <folding />
1132 1054 </state>
1133 1055 </provider>
1134 1056 </entry>
1135   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  1057 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
1136 1058 <provider selected="true" editor-type-id="text-editor">
1137   - <state relative-caret-position="503">
1138   - <caret line="169" column="15" lean-forward="false" selection-start-line="169" selection-start-column="15" selection-end-line="169" selection-end-column="15" />
  1059 + <state relative-caret-position="0">
  1060 + <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1061 + <folding />
  1062 + </state>
  1063 + </provider>
  1064 + </entry>
  1065 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  1066 + <provider selected="true" editor-type-id="text-editor">
  1067 + <state relative-caret-position="165">
  1068 + <caret line="11" column="19" lean-forward="false" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  1069 + <folding />
  1070 + </state>
  1071 + </provider>
  1072 + </entry>
  1073 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1074 + <provider selected="true" editor-type-id="text-editor">
  1075 + <state relative-caret-position="413">
  1076 + <caret line="178" column="10" lean-forward="false" selection-start-line="178" selection-start-column="10" selection-end-line="178" selection-end-column="10" />
1139 1077 <folding />
1140 1078 </state>
1141 1079 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.75)
  4 + kanjai (0.0.76)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk (= 2.6.32)
... ...
... ... @@ -171,10 +171,10 @@ module Kanjai
171 171 else
172 172 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_not_login.js')}'></script>"
173 173 end
174   - js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
175   - css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
176   - js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
177 174 end
  175 + js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
  176 + css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
  177 + js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
178 178 layer.gsub!(marker, js_array.join(''))
179 179 else
180 180 #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
... ...
1 1 module Kanjai
2   - VERSION = "0.0.76"
  2 + VERSION = "0.0.77"
3 3 end
... ...