EDIT / kanjai · Commits

Commit 379ae893706e52628e5d9ed77c72d7d83f53fb7c

Authored by Karpikau Andrei
1 parent 4317cb14

change kanjai version

Inline Side-by-side
Showing 5 changed files with 71 additions and 77 deletions
... ... @@ -136,9 +136,9 @@
136 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.6.0, rbenv: 2.1.3) [gem]" level="application" />
138 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.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" />
  139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.30, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.30, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.30, rbenv: 2.1.3) [gem]" level="application" />
142 142 <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 143 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
144 144 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -156,7 +156,7 @@
156 156 <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.7.0, rbenv: 2.1.3) [gem]" level="application" />
157 157 <orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.7, rbenv: 2.1.3) [gem]" level="application" />
158 158 <orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.1.3) [gem]" level="application" />
159   - <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.6.0, rbenv: 2.1.3) [gem]" level="application" />
  159 + <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.6.1, rbenv: 2.1.3) [gem]" level="application" />
160 160 <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.1, rbenv: 2.1.3) [gem]" level="application" />
161 161 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" />
162 162 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -200,7 +200,7 @@
200 200 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" />
201 201 <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.5, rbenv: 2.1.3) [gem]" level="application" />
202 202 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" />
203   - <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.3, rbenv: 2.1.3) [gem]" level="application" />
  203 + <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.4, rbenv: 2.1.3) [gem]" level="application" />
204 204 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.6, rbenv: 2.1.3) [gem]" level="application" />
205 205 </component>
206 206 <component name="RModuleSettingsStorage">
... ...
... ... @@ -45,6 +45,16 @@
45 45 </provider>
46 46 </entry>
47 47 </file>
  48 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  50 + <provider selected="true" editor-type-id="text-editor">
  51 + <state vertical-scroll-proportion="0.0" vertical-offset="2514" max-vertical-offset="4635">
  52 + <caret line="191" column="35" selection-start-line="182" selection-start-column="0" selection-end-line="191" selection-end-column="35" />
  53 + <folding />
  54 + </state>
  55 + </provider>
  56 + </entry>
  57 + </file>
48 58 <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
49 59 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">
50 60 <provider selected="true" editor-type-id="text-editor">
... ... @@ -65,16 +75,6 @@
65 75 </provider>
66 76 </entry>
67 77 </file>
68   - <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb">
70   - <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="390">
72   - <caret line="14" column="101" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" />
73   - <folding />
74   - </state>
75   - </provider>
76   - </entry>
77   - </file>
78 78 <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
79 79 <entry file="file://$PROJECT_DIR$/config/routes.rb">
80 80 <provider selected="true" editor-type-id="text-editor">
... ... @@ -88,8 +88,8 @@
88 88 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
89 89 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
90 90 <provider selected="true" editor-type-id="text-editor">
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" />
  91 + <state vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="3270">
  92 + <caret line="56" column="17" selection-start-line="56" selection-start-column="17" selection-end-line="56" selection-end-column="17" />
93 93 <folding />
94 94 </state>
95 95 </provider>
... ... @@ -118,7 +118,7 @@
118 118 <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
119 119 <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
120 120 <provider selected="true" editor-type-id="text-editor">
121   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1125">
  121 + <state vertical-scroll-proportion="0.0" vertical-offset="870" max-vertical-offset="1125">
122 122 <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
123 123 <folding />
124 124 </state>
... ... @@ -215,6 +215,7 @@
215 215 <sortByType />
216 216 </navigator>
217 217 <panes>
  218 + <pane id="Scope" />
218 219 <pane id="ProjectPane">
219 220 <subPane>
220 221 <PATH>
... ... @@ -275,38 +276,6 @@
275 276 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
276 277 </PATH_ELEMENT>
277 278 <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="locales" />
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>
306   - <option name="myItemId" value="kanjai" />
307   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
308   - </PATH_ELEMENT>
309   - <PATH_ELEMENT>
310 279 <option name="myItemId" value="app" />
311 280 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
312 281 </PATH_ELEMENT>
... ... @@ -476,7 +445,6 @@
476 445 </subPane>
477 446 </pane>
478 447 <pane id="RailsProjectView" />
479   - <pane id="Scope" />
480 448 </panes>
481 449 </component>
482 450 <component name="PropertiesComponent">
... ... @@ -673,7 +641,7 @@
673 641 <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" />
674 642 <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" />
675 643 <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" />
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" />
  644 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.319063" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
677 645 <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" />
678 646 <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" />
679 647 <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" />
... ... @@ -845,13 +813,6 @@
845 813 </state>
846 814 </provider>
847 815 </entry>
848   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
849   - <provider selected="true" editor-type-id="text-editor">
850   - <state vertical-scroll-proportion="0.0" vertical-offset="2514" max-vertical-offset="4635">
851   - <caret line="191" column="35" selection-start-line="182" selection-start-column="0" selection-end-line="191" selection-end-column="35" />
852   - </state>
853   - </provider>
854   - </entry>
855 816 <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
856 817 <provider selected="true" editor-type-id="text-editor">
857 818 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -962,7 +923,6 @@
962 923 <provider selected="true" editor-type-id="text-editor">
963 924 <state vertical-scroll-proportion="0.0" vertical-offset="45" max-vertical-offset="180">
964 925 <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
965   - <folding />
966 926 </state>
967 927 </provider>
968 928 </entry>
... ... @@ -977,7 +937,6 @@
977 937 <provider selected="true" editor-type-id="text-editor">
978 938 <state vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="840">
979 939 <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
980   - <folding />
981 940 </state>
982 941 </provider>
983 942 </entry>
... ... @@ -985,7 +944,6 @@
985 944 <provider selected="true" editor-type-id="text-editor">
986 945 <state vertical-scroll-proportion="0.09463722" vertical-offset="0" max-vertical-offset="634">
987 946 <caret line="4" column="7" selection-start-line="0" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
988   - <folding />
989 947 </state>
990 948 </provider>
991 949 </entry>
... ... @@ -993,7 +951,6 @@
993 951 <provider selected="true" editor-type-id="text-editor">
994 952 <state vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="480">
995 953 <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
996   - <folding />
997 954 </state>
998 955 </provider>
999 956 </entry>
... ... @@ -1001,7 +958,6 @@
1001 958 <provider selected="true" editor-type-id="text-editor">
1002 959 <state vertical-scroll-proportion="0.0" vertical-offset="105" max-vertical-offset="225">
1003 960 <caret line="7" column="102" selection-start-line="7" selection-start-column="102" selection-end-line="7" selection-end-column="102" />
1004   - <folding />
1005 961 </state>
1006 962 </provider>
1007 963 </entry>
... ... @@ -1009,7 +965,6 @@
1009 965 <provider selected="true" editor-type-id="text-editor">
1010 966 <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="390">
1011 967 <caret line="14" column="101" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" />
1012   - <folding />
1013 968 </state>
1014 969 </provider>
1015 970 </entry>
... ... @@ -1069,10 +1024,18 @@
1069 1024 </state>
1070 1025 </provider>
1071 1026 </entry>
  1027 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  1028 + <provider selected="true" editor-type-id="text-editor">
  1029 + <state vertical-scroll-proportion="0.0" vertical-offset="2514" max-vertical-offset="4635">
  1030 + <caret line="191" column="35" selection-start-line="182" selection-start-column="0" selection-end-line="191" selection-end-column="35" />
  1031 + <folding />
  1032 + </state>
  1033 + </provider>
  1034 + </entry>
1072 1035 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1073 1036 <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" />
  1037 + <state vertical-scroll-proportion="0.0" vertical-offset="420" max-vertical-offset="3270">
  1038 + <caret line="56" column="17" selection-start-line="56" selection-start-column="17" selection-end-line="56" selection-end-column="17" />
1076 1039 <folding />
1077 1040 </state>
1078 1041 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.66)
  4 + kanjai (0.0.67)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -64,13 +64,13 @@ GEM
64 64 acts_as_tree (2.6.0)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.6.28)
68   - aws-sdk-resources (= 2.6.28)
69   - aws-sdk-core (2.6.28)
  67 + aws-sdk (2.6.30)
  68 + aws-sdk-resources (= 2.6.30)
  69 + aws-sdk-core (2.6.30)
70 70 aws-sigv4 (~> 1.0)
71 71 jmespath (~> 1.0)
72   - aws-sdk-resources (2.6.28)
73   - aws-sdk-core (= 2.6.28)
  72 + aws-sdk-resources (2.6.30)
  73 + aws-sdk-core (= 2.6.30)
74 74 aws-sigv4 (1.0.0)
75 75 backport_new_renderer (1.0.0)
76 76 rails
... ... @@ -100,7 +100,7 @@ GEM
100 100 globalid (0.3.7)
101 101 activesupport (>= 4.1.0)
102 102 i18n (0.7.0)
103   - jbuilder (2.6.0)
  103 + jbuilder (2.6.1)
104 104 activesupport (>= 3.0.0, < 5.1)
105 105 multi_json (~> 1.2)
106 106 jmespath (1.3.1)
... ... @@ -202,7 +202,7 @@ GEM
202 202 tilt (2.0.5)
203 203 tzinfo (1.2.2)
204 204 thread_safe (~> 0.1)
205   - uglifier (3.0.3)
  205 + uglifier (3.0.4)
206 206 execjs (>= 0.3.0, < 3)
207 207 warden (1.2.6)
208 208 rack (>= 1.0)
... ...
... ... @@ -33,7 +33,38 @@ module Kanjai
33 33 @pdf_content = content_for_render
34 34 respond_to do |format|
35 35 format.html{render :text => content_for_render}
36   - format.pdf{render pdf: "file_name", print_media_type: true, orientation: 'Landscape', page_size: params[:page_size] || 'A4'}
  36 + format.pdf{
  37 + options = {
  38 + pdf: "file_name",
  39 + print_media_type: true,
  40 + orientation: 'Landscape',
  41 + page_size: params[:page_size] || 'A4'
  42 + }
  43 +
  44 + if params[:orientation].to_s.present?
  45 + options[:orientation] = params[:orientation]
  46 + end
  47 +
  48 + if params['footer_center'].to_s.present?
  49 + options[:footer] = {
  50 + center: params['footer_center']
  51 + }
  52 + end
  53 + if params['header_left'].to_s.present?
  54 + options[:header] ||= {}
  55 + options[:header][:left] = params['header_left']
  56 + end
  57 + if params['header_center'].to_s.present?
  58 + options[:header] ||= {}
  59 + options[:header][:center] = params['header_center']
  60 + end
  61 + if params['header_right'].to_s.present?
  62 + options[:header] ||= {}
  63 + options[:header][:right] = params['header_right']
  64 + end
  65 +
  66 + render options
  67 + }
37 68 end
38 69
39 70 #render :text => content_for_render and return
... ...
1 1 module Kanjai
2   - VERSION = "0.0.67"
  2 + VERSION = "0.0.68"
3 3 end
... ...