EDIT / kanjai · Commits

Commit 0c82581376511a10e6d6ac822650973569693c26

Authored by Karpikau Andrei
1 parent a936583c

check pdf generate

Inline Side-by-side
Showing 4 changed files with 83 additions and 63 deletions
@@ -45,22 +45,14 @@ @@ -45,22 +45,14 @@
45 </provider> 45 </provider>
46 </entry> 46 </entry>
47 </file> 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="780" max-vertical-offset="4635">  
52 - <caret line="192" column="0" selection-start-line="192" selection-start-column="0" selection-end-line="192" selection-end-column="0" />  
53 - <folding />  
54 - </state>  
55 - </provider>  
56 - </entry>  
57 - </file>  
58 <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">
59 <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">
60 <provider selected="true" editor-type-id="text-editor"> 50 <provider selected="true" editor-type-id="text-editor">
61 <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="300"> 51 <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="300">
62 <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" />
63 - <folding /> 53 + <folding>
  54 + <element signature="n#t('admin.admin_users.edit')#0;n#!!top" expanded="false" />
  55 + </folding>
64 </state> 56 </state>
65 </provider> 57 </provider>
66 </entry> 58 </entry>
@@ -78,8 +70,8 @@ @@ -78,8 +70,8 @@
78 <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false"> 70 <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
79 <entry file="file://$PROJECT_DIR$/config/routes.rb"> 71 <entry file="file://$PROJECT_DIR$/config/routes.rb">
80 <provider selected="true" editor-type-id="text-editor"> 72 <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" /> 73 + <state vertical-scroll-proportion="0.0" vertical-offset="356" max-vertical-offset="990">
  74 + <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
83 <folding /> 75 <folding />
84 </state> 76 </state>
85 </provider> 77 </provider>
@@ -88,8 +80,18 @@ @@ -88,8 +80,18 @@
88 <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false"> 80 <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"> 81 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
90 <provider selected="true" editor-type-id="text-editor"> 82 <provider selected="true" editor-type-id="text-editor">
91 - <state vertical-scroll-proportion="0.0" vertical-offset="461" max-vertical-offset="3405">  
92 - <caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" /> 83 + <state vertical-scroll-proportion="-13.592592" vertical-offset="413" max-vertical-offset="3090">
  84 + <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
  85 + <folding />
  86 + </state>
  87 + </provider>
  88 + </entry>
  89 + </file>
  90 + <file leaf-file-name="application_helper.rb" pinned="false" current-in-tab="false">
  91 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  92 + <provider selected="true" editor-type-id="text-editor">
  93 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
  94 + <caret line="11" column="7" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
93 <folding /> 95 <folding />
94 </state> 96 </state>
95 </provider> 97 </provider>
@@ -276,6 +278,20 @@ @@ -276,6 +278,20 @@
276 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 278 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
277 </PATH_ELEMENT> 279 </PATH_ELEMENT>
278 <PATH_ELEMENT> 280 <PATH_ELEMENT>
  281 + <option name="myItemId" value="config" />
  282 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  283 + </PATH_ELEMENT>
  284 + </PATH>
  285 + <PATH>
  286 + <PATH_ELEMENT>
  287 + <option name="myItemId" value="kanjai" />
  288 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  289 + </PATH_ELEMENT>
  290 + <PATH_ELEMENT>
  291 + <option name="myItemId" value="kanjai" />
  292 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  293 + </PATH_ELEMENT>
  294 + <PATH_ELEMENT>
279 <option name="myItemId" value="app" /> 295 <option name="myItemId" value="app" />
280 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 296 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
281 </PATH_ELEMENT> 297 </PATH_ELEMENT>
@@ -390,6 +406,28 @@ @@ -390,6 +406,28 @@
390 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 406 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
391 </PATH_ELEMENT> 407 </PATH_ELEMENT>
392 <PATH_ELEMENT> 408 <PATH_ELEMENT>
  409 + <option name="myItemId" value="helpers" />
  410 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  411 + </PATH_ELEMENT>
  412 + <PATH_ELEMENT>
  413 + <option name="myItemId" value="kanjai" />
  414 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  415 + </PATH_ELEMENT>
  416 + </PATH>
  417 + <PATH>
  418 + <PATH_ELEMENT>
  419 + <option name="myItemId" value="kanjai" />
  420 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  421 + </PATH_ELEMENT>
  422 + <PATH_ELEMENT>
  423 + <option name="myItemId" value="kanjai" />
  424 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  425 + </PATH_ELEMENT>
  426 + <PATH_ELEMENT>
  427 + <option name="myItemId" value="app" />
  428 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  429 + </PATH_ELEMENT>
  430 + <PATH_ELEMENT>
393 <option name="myItemId" value="controllers" /> 431 <option name="myItemId" value="controllers" />
394 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 432 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
395 </PATH_ELEMENT> 433 </PATH_ELEMENT>
@@ -680,13 +718,6 @@ @@ -680,13 +718,6 @@
680 <watches-manager /> 718 <watches-manager />
681 </component> 719 </component>
682 <component name="editorHistoryManager"> 720 <component name="editorHistoryManager">
683 - <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">  
684 - <provider selected="true" editor-type-id="text-editor">  
685 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">  
686 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
687 - </state>  
688 - </provider>  
689 - </entry>  
690 <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb"> 721 <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
691 <provider selected="true" editor-type-id="text-editor"> 722 <provider selected="true" editor-type-id="text-editor">
692 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 723 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -988,15 +1019,9 @@ @@ -988,15 +1019,9 @@
988 <provider selected="true" editor-type-id="text-editor"> 1019 <provider selected="true" editor-type-id="text-editor">
989 <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="300"> 1020 <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="300">
990 <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" /> 1021 <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />
991 - <folding />  
992 - </state>  
993 - </provider>  
994 - </entry>  
995 - <entry file="file://$PROJECT_DIR$/config/routes.rb">  
996 - <provider selected="true" editor-type-id="text-editor">  
997 - <state vertical-scroll-proportion="0.0" vertical-offset="300" max-vertical-offset="990">  
998 - <caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />  
999 - <folding /> 1022 + <folding>
  1023 + <element signature="n#t('admin.admin_users.edit')#0;n#!!top" expanded="false" />
  1024 + </folding>
1000 </state> 1025 </state>
1001 </provider> 1026 </provider>
1002 </entry> 1027 </entry>
@@ -1026,16 +1051,32 @@ @@ -1026,16 +1051,32 @@
1026 </entry> 1051 </entry>
1027 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb"> 1052 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
1028 <provider selected="true" editor-type-id="text-editor"> 1053 <provider selected="true" editor-type-id="text-editor">
1029 - <state vertical-scroll-proportion="0.0" vertical-offset="780" max-vertical-offset="4635"> 1054 + <state vertical-scroll-proportion="4.542587" vertical-offset="0" max-vertical-offset="4635">
1030 <caret line="192" column="0" selection-start-line="192" selection-start-column="0" selection-end-line="192" selection-end-column="0" /> 1055 <caret line="192" column="0" selection-start-line="192" selection-start-column="0" selection-end-line="192" selection-end-column="0" />
1031 <folding /> 1056 <folding />
1032 </state> 1057 </state>
1033 </provider> 1058 </provider>
1034 </entry> 1059 </entry>
  1060 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
  1061 + <provider selected="true" editor-type-id="text-editor">
  1062 + <state vertical-scroll-proportion="0.0" vertical-offset="356" max-vertical-offset="990">
  1063 + <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" />
  1064 + <folding />
  1065 + </state>
  1066 + </provider>
  1067 + </entry>
  1068 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  1069 + <provider selected="true" editor-type-id="text-editor">
  1070 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
  1071 + <caret line="11" column="7" selection-start-line="11" selection-start-column="7" selection-end-line="11" selection-end-column="7" />
  1072 + <folding />
  1073 + </state>
  1074 + </provider>
  1075 + </entry>
1035 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 1076 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1036 <provider selected="true" editor-type-id="text-editor"> 1077 <provider selected="true" editor-type-id="text-editor">
1037 - <state vertical-scroll-proportion="0.0" vertical-offset="461" max-vertical-offset="3405">  
1038 - <caret line="70" column="33" selection-start-line="70" selection-start-column="33" selection-end-line="70" selection-end-column="33" /> 1078 + <state vertical-scroll-proportion="-13.592592" vertical-offset="413" max-vertical-offset="3090">
  1079 + <caret line="52" column="0" selection-start-line="52" selection-start-column="0" selection-end-line="52" selection-end-column="0" />
1039 <folding /> 1080 <folding />
1040 </state> 1081 </state>
1041 </provider> 1082 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.68) 4 + kanjai (0.0.69)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -37,41 +37,20 @@ module Kanjai @@ -37,41 +37,20 @@ module Kanjai
37 options = { 37 options = {
38 pdf: "file_name", 38 pdf: "file_name",
39 print_media_type: true, 39 print_media_type: true,
40 - orientation: 'Landscape', 40 + orientation: params[:orientation],
41 page_size: params[:page_size] || 'A4' 41 page_size: params[:page_size] || 'A4'
42 } 42 }
43 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? 44 + if params['header_content']
54 options[:header] ||= {} 45 options[:header] ||= {}
55 - options[:header][:left] = params['header_left'] 46 + options[:header][:content] = params['header_content']
56 end 47 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 - if params['header_font_size'].to_s.present?  
66 - options[:header] ||= {}  
67 - options[:header][:font_size] = params['header_font_size']  
68 - end  
69 - if params['footer_font_size'].to_s.present? 48 +
  49 + if params['footer_content']
70 options[:footer] ||= {} 50 options[:footer] ||= {}
71 - options[:footer][:font_size] = params['footer_font_size'] 51 + options[:footer][:content] = params['footer_content']
72 end 52 end
73 53
74 -  
75 render options 54 render options
76 } 55 }
77 end 56 end
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.69" 2 + VERSION = "0.0.70"
3 end 3 end