EDIT / kanjai · Commits

Commit 4317cb148ae8c3584a05c03f0f9bc44a5253c524

Authored by Karpikau Andrei
1 parent 98002b20

check for pdf page size

Inline Side-by-side
Showing 5 changed files with 106 additions and 127 deletions
@@ -136,9 +136,9 @@ @@ -136,9 +136,9 @@
136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.2, rbenv: 2.1.3) [gem]" level="application" /> 136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.2, rbenv: 2.1.3) [gem]" level="application" />
137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.6.0, rbenv: 2.1.3) [gem]" level="application" /> 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.6.0, rbenv: 2.1.3) [gem]" level="application" />
138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" /> 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.23, rbenv: 2.1.3) [gem]" level="application" />  
140 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.23, rbenv: 2.1.3) [gem]" level="application" />  
141 - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.23, rbenv: 2.1.3) [gem]" level="application" /> 139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.28, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.28, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.28, rbenv: 2.1.3) [gem]" level="application" />
142 <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 142 <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" /> 143 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
144 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" /> 144 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
160 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.1, rbenv: 2.1.3) [gem]" level="application" /> 160 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.1, rbenv: 2.1.3) [gem]" level="application" />
161 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" /> 161 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" />
162 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" /> 162 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
163 - <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.15, rbenv: 2.1.3) [gem]" level="application" /> 163 + <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.17, rbenv: 2.1.3) [gem]" level="application" />
164 <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.1.3) [gem]" level="application" /> 164 <orderEntry type="library" scope="PROVIDED" name="loofah (v2.0.3, rbenv: 2.1.3) [gem]" level="application" />
165 <orderEntry type="library" scope="PROVIDED" name="mail (v2.6.4, rbenv: 2.1.3) [gem]" level="application" /> 165 <orderEntry type="library" scope="PROVIDED" name="mail (v2.6.4, rbenv: 2.1.3) [gem]" level="application" />
166 <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, rbenv: 2.1.3) [gem]" level="application" /> 166 <orderEntry type="library" scope="PROVIDED" name="mime-types (v3.1, rbenv: 2.1.3) [gem]" level="application" />
@@ -25,20 +25,6 @@ @@ -25,20 +25,6 @@
25 </component> 25 </component>
26 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
27 <leaf> 27 <leaf>
28 - <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">  
30 - <provider selected="true" editor-type-id="text-editor">  
31 - <state vertical-scroll-proportion="-11.875" vertical-offset="0" max-vertical-offset="840">  
32 - <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />  
33 - <folding>  
34 - <element signature="e#596#625#0#ruby" expanded="true" />  
35 - <element signature="e#713#733#0#ruby" expanded="true" />  
36 - <element signature="e#1031#1056#0#ruby" expanded="true" />  
37 - </folding>  
38 - </state>  
39 - </provider>  
40 - </entry>  
41 - </file>  
42 <file leaf-file-name="admin_users_controller.rb" pinned="false" current-in-tab="false"> 28 <file leaf-file-name="admin_users_controller.rb" pinned="false" current-in-tab="false">
43 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb"> 29 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb">
44 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
@@ -62,23 +48,9 @@ @@ -62,23 +48,9 @@
62 <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false"> 48 <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
63 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb"> 49 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">
64 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
65 - <state vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="300"> 51 + <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="300">
66 <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" /> 52 <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />
67 - <folding>  
68 - <element signature="n#t('admin.admin_users.edit')#0;n#!!top" expanded="true" />  
69 - </folding>  
70 - </state>  
71 - </provider>  
72 - </entry>  
73 - </file>  
74 - <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">  
75 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb">  
76 - <provider selected="true" editor-type-id="text-editor">  
77 - <state vertical-scroll-proportion="-1.25" vertical-offset="0" max-vertical-offset="480">  
78 - <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />  
79 - <folding>  
80 - <element signature="n#t('activerecord.attributes.admin_user.email')#0;n#!!top" expanded="true" />  
81 - </folding> 53 + <folding />
82 </state> 54 </state>
83 </provider> 55 </provider>
84 </entry> 56 </entry>
@@ -96,40 +68,58 @@ @@ -96,40 +68,58 @@
96 <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false"> 68 <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
97 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb"> 69 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb">
98 <provider selected="true" editor-type-id="text-editor"> 70 <provider selected="true" editor-type-id="text-editor">
99 - <state vertical-scroll-proportion="-8.75" vertical-offset="0" max-vertical-offset="390"> 71 + <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="390">
100 <caret line="14" column="101" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" /> 72 <caret line="14" column="101" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" />
101 <folding /> 73 <folding />
102 </state> 74 </state>
103 </provider> 75 </provider>
104 </entry> 76 </entry>
105 </file> 77 </file>
106 - <file leaf-file-name="new.html.erb" pinned="false" current-in-tab="false">  
107 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/new.html.erb"> 78 + <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
  80 + <provider selected="true" editor-type-id="text-editor">
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="300" max-vertical-offset="990">
  82 + <caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
  83 + <folding />
  84 + </state>
  85 + </provider>
  86 + </entry>
  87 + </file>
  88 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
108 <provider selected="true" editor-type-id="text-editor"> 90 <provider selected="true" editor-type-id="text-editor">
109 - <state vertical-scroll-proportion="-4.375" vertical-offset="0" max-vertical-offset="225">  
110 - <caret line="7" column="102" selection-start-line="7" selection-start-column="102" selection-end-line="7" selection-end-column="102" />  
111 - <folding>  
112 - <element signature="n#t('admin.admin_users.create')#0;n#!!top" expanded="true" />  
113 - </folding> 91 + <state vertical-scroll-proportion="0.0" vertical-offset="315" max-vertical-offset="2805">
  92 + <caret line="45" column="15" selection-start-line="45" selection-start-column="15" selection-end-line="45" selection-end-column="15" />
  93 + <folding />
114 </state> 94 </state>
115 </provider> 95 </provider>
116 </entry> 96 </entry>
117 </file> 97 </file>
118 - <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">  
119 - <entry file="file://$PROJECT_DIR$/config/routes.rb"> 98 + <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/Gemfile">
120 <provider selected="true" editor-type-id="text-editor"> 100 <provider selected="true" editor-type-id="text-editor">
121 - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="990">  
122 - <caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" /> 101 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  102 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  103 + <folding />
  104 + </state>
  105 + </provider>
  106 + </entry>
  107 + </file>
  108 + <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
  110 + <provider selected="true" editor-type-id="text-editor">
  111 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3330">
  112 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
123 <folding /> 113 <folding />
124 </state> 114 </state>
125 </provider> 115 </provider>
126 </entry> 116 </entry>
127 </file> 117 </file>
128 - <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">  
129 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb"> 118 + <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
130 <provider selected="true" editor-type-id="text-editor"> 120 <provider selected="true" editor-type-id="text-editor">
131 - <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="180">  
132 - <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> 121 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1125">
  122 + <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
133 <folding /> 123 <folding />
134 </state> 124 </state>
135 </provider> 125 </provider>
@@ -181,7 +171,6 @@ @@ -181,7 +171,6 @@
181 <option value="$PROJECT_DIR$/lib/zip.rb" /> 171 <option value="$PROJECT_DIR$/lib/zip.rb" />
182 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" /> 172 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
183 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" /> 173 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
184 - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />  
185 <option value="$PROJECT_DIR$/config/routes.rb" /> 174 <option value="$PROJECT_DIR$/config/routes.rb" />
186 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" /> 175 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
187 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb" /> 176 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb" />
@@ -190,6 +179,7 @@ @@ -190,6 +179,7 @@
190 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb" /> 179 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb" />
191 <option value="$PROJECT_DIR$/config/locales/en.yml" /> 180 <option value="$PROJECT_DIR$/config/locales/en.yml" />
192 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb" /> 181 <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb" />
  182 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
193 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 183 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
194 </list> 184 </list>
195 </option> 185 </option>
@@ -225,7 +215,6 @@ @@ -225,7 +215,6 @@
225 <sortByType /> 215 <sortByType />
226 </navigator> 216 </navigator>
227 <panes> 217 <panes>
228 - <pane id="RailsProjectView" />  
229 <pane id="ProjectPane"> 218 <pane id="ProjectPane">
230 <subPane> 219 <subPane>
231 <PATH> 220 <PATH>
@@ -486,6 +475,7 @@ @@ -486,6 +475,7 @@
486 </PATH> 475 </PATH>
487 </subPane> 476 </subPane>
488 </pane> 477 </pane>
  478 + <pane id="RailsProjectView" />
489 <pane id="Scope" /> 479 <pane id="Scope" />
490 </panes> 480 </panes>
491 </component> 481 </component>
@@ -683,20 +673,20 @@ @@ -683,20 +673,20 @@
683 <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" /> 673 <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" />
684 <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" /> 674 <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" />
685 <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" /> 675 <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" />
686 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30452344" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
687 - <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" />  
688 - <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" /> 676 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30936995" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
689 <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" /> 677 <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" />
690 <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" /> 678 <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" />
691 <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" /> 679 <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" />
692 <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" /> 680 <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" />
693 <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" /> 681 <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" />
694 - <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" />  
695 <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" /> 682 <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" />
  683 + <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" />
  684 + <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" />
696 <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" /> 685 <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" />
697 <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" /> 686 <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" />
698 - <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" /> 687 + <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" />
699 <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" /> 688 <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" />
  689 + <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" />
700 </layout> 690 </layout>
701 </component> 691 </component>
702 <component name="Vcs.Log.UiProperties"> 692 <component name="Vcs.Log.UiProperties">
@@ -722,13 +712,6 @@ @@ -722,13 +712,6 @@
722 <watches-manager /> 712 <watches-manager />
723 </component> 713 </component>
724 <component name="editorHistoryManager"> 714 <component name="editorHistoryManager">
725 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">  
726 - <provider selected="true" editor-type-id="text-editor">  
727 - <state vertical-scroll-proportion="0.0" vertical-offset="1234" max-vertical-offset="1650">  
728 - <caret line="92" column="0" selection-start-line="92" selection-start-column="0" selection-end-line="96" selection-end-column="7" />  
729 - </state>  
730 - </provider>  
731 - </entry>  
732 <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake"> 715 <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
733 <provider selected="true" editor-type-id="text-editor"> 716 <provider selected="true" editor-type-id="text-editor">
734 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416"> 717 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
@@ -855,21 +838,6 @@ @@ -855,21 +838,6 @@
855 </state> 838 </state>
856 </provider> 839 </provider>
857 </entry> 840 </entry>
858 - <entry file="file://$PROJECT_DIR$/Gemfile">  
859 - <provider selected="true" editor-type-id="text-editor">  
860 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
861 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
862 - <folding />  
863 - </state>  
864 - </provider>  
865 - </entry>  
866 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">  
867 - <provider selected="true" editor-type-id="text-editor">  
868 - <state vertical-scroll-proportion="0.0" vertical-offset="491" max-vertical-offset="1125">  
869 - <caret line="67" column="0" selection-start-line="67" selection-start-column="0" selection-end-line="67" selection-end-column="0" />  
870 - </state>  
871 - </provider>  
872 - </entry>  
873 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb"> 841 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
874 <provider selected="true" editor-type-id="text-editor"> 842 <provider selected="true" editor-type-id="text-editor">
875 <state vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="615"> 843 <state vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="615">
@@ -976,19 +944,10 @@ @@ -976,19 +944,10 @@
976 </state> 944 </state>
977 </provider> 945 </provider>
978 </entry> 946 </entry>
979 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">  
980 - <provider selected="true" editor-type-id="text-editor">  
981 - <state vertical-scroll-proportion="0.0" vertical-offset="2078" max-vertical-offset="2805">  
982 - <caret line="153" column="143" selection-start-line="153" selection-start-column="132" selection-end-line="153" selection-end-column="143" />  
983 - <folding />  
984 - </state>  
985 - </provider>  
986 - </entry>  
987 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb"> 947 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb">
988 <provider selected="true" editor-type-id="text-editor"> 948 <provider selected="true" editor-type-id="text-editor">
989 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360"> 949 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
990 <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" /> 950 <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
991 - <folding />  
992 </state> 951 </state>
993 </provider> 952 </provider>
994 </entry> 953 </entry>
@@ -996,43 +955,29 @@ @@ -996,43 +955,29 @@
996 <provider selected="true" editor-type-id="text-editor"> 955 <provider selected="true" editor-type-id="text-editor">
997 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 956 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
998 <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" /> 957 <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
999 - <folding />  
1000 </state> 958 </state>
1001 </provider> 959 </provider>
1002 </entry> 960 </entry>
1003 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb"> 961 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb">
1004 <provider selected="true" editor-type-id="text-editor"> 962 <provider selected="true" editor-type-id="text-editor">
1005 - <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="180"> 963 + <state vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="180">
1006 <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" /> 964 <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
1007 <folding /> 965 <folding />
1008 </state> 966 </state>
1009 </provider> 967 </provider>
1010 </entry> 968 </entry>
1011 - <entry file="file://$PROJECT_DIR$/config/routes.rb">  
1012 - <provider selected="true" editor-type-id="text-editor">  
1013 - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="990">  
1014 - <caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />  
1015 - <folding />  
1016 - </state>  
1017 - </provider>  
1018 - </entry>  
1019 <entry file="file://$PROJECT_DIR$/config/locales/de.yml"> 969 <entry file="file://$PROJECT_DIR$/config/locales/de.yml">
1020 <provider selected="true" editor-type-id="text-editor"> 970 <provider selected="true" editor-type-id="text-editor">
1021 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 971 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1022 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 972 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1023 - <folding />  
1024 </state> 973 </state>
1025 </provider> 974 </provider>
1026 </entry> 975 </entry>
1027 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 976 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
1028 <provider selected="true" editor-type-id="text-editor"> 977 <provider selected="true" editor-type-id="text-editor">
1029 - <state vertical-scroll-proportion="-11.875" vertical-offset="0" max-vertical-offset="840"> 978 + <state vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="840">
1030 <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" /> 979 <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
1031 - <folding>  
1032 - <element signature="e#596#625#0#ruby" expanded="true" />  
1033 - <element signature="e#713#733#0#ruby" expanded="true" />  
1034 - <element signature="e#1031#1056#0#ruby" expanded="true" />  
1035 - </folding> 980 + <folding />
1036 </state> 981 </state>
1037 </provider> 982 </provider>
1038 </entry> 983 </entry>
@@ -1046,27 +991,23 @@ @@ -1046,27 +991,23 @@
1046 </entry> 991 </entry>
1047 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb"> 992 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb">
1048 <provider selected="true" editor-type-id="text-editor"> 993 <provider selected="true" editor-type-id="text-editor">
1049 - <state vertical-scroll-proportion="-1.25" vertical-offset="0" max-vertical-offset="480"> 994 + <state vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="480">
1050 <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" /> 995 <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
1051 - <folding>  
1052 - <element signature="n#t('activerecord.attributes.admin_user.email')#0;n#!!top" expanded="true" />  
1053 - </folding> 996 + <folding />
1054 </state> 997 </state>
1055 </provider> 998 </provider>
1056 </entry> 999 </entry>
1057 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/new.html.erb"> 1000 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/new.html.erb">
1058 <provider selected="true" editor-type-id="text-editor"> 1001 <provider selected="true" editor-type-id="text-editor">
1059 - <state vertical-scroll-proportion="-4.375" vertical-offset="0" max-vertical-offset="225"> 1002 + <state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="225">
1060 <caret line="7" column="102" selection-start-line="7" selection-start-column="102" selection-end-line="7" selection-end-column="102" /> 1003 <caret line="7" column="102" selection-start-line="7" selection-start-column="102" selection-end-line="7" selection-end-column="102" />
1061 - <folding>  
1062 - <element signature="n#t('admin.admin_users.create')#0;n#!!top" expanded="true" />  
1063 - </folding> 1004 + <folding />
1064 </state> 1005 </state>
1065 </provider> 1006 </provider>
1066 </entry> 1007 </entry>
1067 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb"> 1008 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb">
1068 <provider selected="true" editor-type-id="text-editor"> 1009 <provider selected="true" editor-type-id="text-editor">
1069 - <state vertical-scroll-proportion="-8.75" vertical-offset="0" max-vertical-offset="390"> 1010 + <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="390">
1070 <caret line="14" column="101" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" /> 1011 <caret line="14" column="101" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" />
1071 <folding /> 1012 <folding />
1072 </state> 1013 </state>
@@ -1090,11 +1031,49 @@ @@ -1090,11 +1031,49 @@
1090 </entry> 1031 </entry>
1091 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb"> 1032 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">
1092 <provider selected="true" editor-type-id="text-editor"> 1033 <provider selected="true" editor-type-id="text-editor">
1093 - <state vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="300"> 1034 + <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="300">
1094 <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" /> 1035 <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />
1095 - <folding>  
1096 - <element signature="n#t('admin.admin_users.edit')#0;n#!!top" expanded="true" />  
1097 - </folding> 1036 + <folding />
  1037 + </state>
  1038 + </provider>
  1039 + </entry>
  1040 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
  1041 + <provider selected="true" editor-type-id="text-editor">
  1042 + <state vertical-scroll-proportion="0.0" vertical-offset="300" max-vertical-offset="990">
  1043 + <caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
  1044 + <folding />
  1045 + </state>
  1046 + </provider>
  1047 + </entry>
  1048 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  1049 + <provider selected="true" editor-type-id="text-editor">
  1050 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1125">
  1051 + <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
  1052 + <folding />
  1053 + </state>
  1054 + </provider>
  1055 + </entry>
  1056 + <entry file="file://$PROJECT_DIR$/Gemfile">
  1057 + <provider selected="true" editor-type-id="text-editor">
  1058 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1059 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1060 + <folding />
  1061 + </state>
  1062 + </provider>
  1063 + </entry>
  1064 + <entry file="file://$PROJECT_DIR$/Gemfile.lock">
  1065 + <provider selected="true" editor-type-id="text-editor">
  1066 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="3330">
  1067 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1068 + <folding />
  1069 + </state>
  1070 + </provider>
  1071 + </entry>
  1072 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1073 + <provider selected="true" editor-type-id="text-editor">
  1074 + <state vertical-scroll-proportion="0.0" vertical-offset="315" max-vertical-offset="2805">
  1075 + <caret line="45" column="15" selection-start-line="45" selection-start-column="15" selection-end-line="45" selection-end-column="15" />
  1076 + <folding />
1098 </state> 1077 </state>
1099 </provider> 1078 </provider>
1100 </entry> 1079 </entry>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.65) 4 + kanjai (0.0.66)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -64,13 +64,13 @@ GEM @@ -64,13 +64,13 @@ GEM
64 acts_as_tree (2.6.0) 64 acts_as_tree (2.6.0)
65 activerecord (>= 3.0.0) 65 activerecord (>= 3.0.0)
66 arel (6.0.3) 66 arel (6.0.3)
67 - aws-sdk (2.6.23)  
68 - aws-sdk-resources (= 2.6.23)  
69 - aws-sdk-core (2.6.23) 67 + aws-sdk (2.6.28)
  68 + aws-sdk-resources (= 2.6.28)
  69 + aws-sdk-core (2.6.28)
70 aws-sigv4 (~> 1.0) 70 aws-sigv4 (~> 1.0)
71 jmespath (~> 1.0) 71 jmespath (~> 1.0)
72 - aws-sdk-resources (2.6.23)  
73 - aws-sdk-core (= 2.6.23) 72 + aws-sdk-resources (2.6.28)
  73 + aws-sdk-core (= 2.6.28)
74 aws-sigv4 (1.0.0) 74 aws-sigv4 (1.0.0)
75 backport_new_renderer (1.0.0) 75 backport_new_renderer (1.0.0)
76 rails 76 rails
@@ -108,7 +108,7 @@ GEM @@ -108,7 +108,7 @@ GEM
108 railties (>= 3.0, < 5.0) 108 railties (>= 3.0, < 5.0)
109 thor (>= 0.14, < 2.0) 109 thor (>= 0.14, < 2.0)
110 json (1.8.3) 110 json (1.8.3)
111 - libv8 (3.16.14.15) 111 + libv8 (3.16.14.17)
112 loofah (2.0.3) 112 loofah (2.0.3)
113 nokogiri (>= 1.5.9) 113 nokogiri (>= 1.5.9)
114 mail (2.6.4) 114 mail (2.6.4)
@@ -33,7 +33,7 @@ module Kanjai @@ -33,7 +33,7 @@ module Kanjai
33 @pdf_content = content_for_render 33 @pdf_content = content_for_render
34 respond_to do |format| 34 respond_to do |format|
35 format.html{render :text => content_for_render} 35 format.html{render :text => content_for_render}
36 - format.pdf{render pdf: "file_name", print_media_type: true, orientation: 'Landscape'} 36 + format.pdf{render pdf: "file_name", print_media_type: true, orientation: 'Landscape', page_size: params[:page_size] || 'A4'}
37 end 37 end
38 38
39 #render :text => content_for_render and return 39 #render :text => content_for_render and return
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.66" 2 + VERSION = "0.0.67"
3 end 3 end