EDIT / kanjai · Commits

Commit 2a67540d0e0faa251470a938de463661dcad7abd

Authored by Karpikau Andrei
1 parent 2e681dcc

change version

Inline Side-by-side
Showing 4 changed files with 154 additions and 101 deletions
@@ -25,11 +25,11 @@ @@ -25,11 +25,11 @@
25 </component> 25 </component>
26 <component name="FileEditorManager"> 26 <component name="FileEditorManager">
27 <leaf> 27 <leaf>
28 - <file leaf-file-name="zip.rb" pinned="false" current-in-tab="false">  
29 - <entry file="file://$PROJECT_DIR$/lib/zip.rb"> 28 + <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
30 <provider selected="true" editor-type-id="text-editor"> 30 <provider selected="true" editor-type-id="text-editor">
31 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="6495">  
32 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 31 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  32 + <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
33 <folding /> 33 <folding />
34 </state> 34 </state>
35 </provider> 35 </provider>
@@ -55,41 +55,69 @@ @@ -55,41 +55,69 @@
55 </provider> 55 </provider>
56 </entry> 56 </entry>
57 </file> 57 </file>
58 - <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">  
59 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb"> 58 + <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
60 <provider selected="true" editor-type-id="text-editor"> 60 <provider selected="true" editor-type-id="text-editor">
61 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="180">  
62 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 61 + <state vertical-scroll-proportion="-12.291667" vertical-offset="980" max-vertical-offset="1770">
  62 + <caret line="85" column="124" selection-start-line="85" selection-start-column="124" selection-end-line="85" selection-end-column="124" />
63 <folding /> 63 <folding />
64 </state> 64 </state>
65 </provider> 65 </provider>
66 </entry> 66 </entry>
67 </file> 67 </file>
68 - <file leaf-file-name="show.pdf.erb" pinned="false" current-in-tab="false">  
69 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb"> 68 + <file leaf-file-name="html_generator.js" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
70 <provider selected="true" editor-type-id="text-editor"> 70 <provider selected="true" editor-type-id="text-editor">
71 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">  
72 - <caret line="0" column="26" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" /> 71 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="8550">
  72 + <caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
  73 + <folding>
  74 + <marker date="1470228118000" expanded="true" signature="503:515" placeholder="..." />
  75 + </folding>
  76 + </state>
  77 + </provider>
  78 + </entry>
  79 + </file>
  80 + <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
  81 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  82 + <provider selected="true" editor-type-id="text-editor">
  83 + <state vertical-scroll-proportion="0.0" vertical-offset="2520" max-vertical-offset="7845">
  84 + <caret line="189" column="26" selection-start-line="189" selection-start-column="26" selection-end-line="189" selection-end-column="26" />
  85 + <folding>
  86 + <marker date="1475744650000" expanded="true" signature="1842:1884" placeholder="..." />
  87 + <marker date="1475744650000" expanded="true" signature="4090:4108" placeholder="..." />
  88 + <marker date="1475744650000" expanded="true" signature="4122:4140" placeholder="..." />
  89 + <marker date="1475744650000" expanded="true" signature="4192:4202" placeholder="..." />
  90 + <marker date="1475744650000" expanded="true" signature="4229:4292" placeholder="..." />
  91 + </folding>
  92 + </state>
  93 + </provider>
  94 + </entry>
  95 + </file>
  96 + <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">
  97 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  98 + <provider selected="true" editor-type-id="text-editor">
  99 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">
  100 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
73 <folding /> 101 <folding />
74 </state> 102 </state>
75 </provider> 103 </provider>
76 </entry> 104 </entry>
77 </file> 105 </file>
78 - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">  
79 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb"> 106 + <file leaf-file-name="show.html.erb" pinned="false" current-in-tab="false">
  107 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
80 <provider selected="true" editor-type-id="text-editor"> 108 <provider selected="true" editor-type-id="text-editor">
81 - <state vertical-scroll-proportion="0.0" vertical-offset="401" max-vertical-offset="1035">  
82 - <caret line="31" column="25" selection-start-line="31" selection-start-column="13" selection-end-line="31" selection-end-column="25" /> 109 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="180">
  110 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
83 <folding /> 111 <folding />
84 </state> 112 </state>
85 </provider> 113 </provider>
86 </entry> 114 </entry>
87 </file> 115 </file>
88 - <file leaf-file-name="content_function.rb" pinned="false" current-in-tab="false">  
89 - <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb"> 116 + <file leaf-file-name="show.pdf.erb" pinned="false" current-in-tab="false">
  117 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
90 <provider selected="true" editor-type-id="text-editor"> 118 <provider selected="true" editor-type-id="text-editor">
91 - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="2520">  
92 - <caret line="6" column="38" selection-start-line="6" selection-start-column="38" selection-end-line="6" selection-end-column="38" /> 119 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  120 + <caret line="0" column="26" selection-start-line="0" selection-start-column="26" selection-end-line="0" selection-end-column="26" />
93 <folding /> 121 <folding />
94 </state> 122 </state>
95 </provider> 123 </provider>
@@ -98,7 +126,7 @@ @@ -98,7 +126,7 @@
98 <file leaf-file-name="install.rake" pinned="false" current-in-tab="false"> 126 <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
99 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 127 <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
100 <provider selected="true" editor-type-id="text-editor"> 128 <provider selected="true" editor-type-id="text-editor">
101 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390"> 129 + <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="390">
102 <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" /> 130 <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
103 <folding /> 131 <folding />
104 </state> 132 </state>
@@ -138,7 +166,6 @@ @@ -138,7 +166,6 @@
138 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" /> 166 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
139 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" /> 167 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
140 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" /> 168 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
141 - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />  
142 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" /> 169 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
143 <option value="$PROJECT_DIR$/db/migrate/20160804133136_add_image_link_to_kanjai_images.rb" /> 170 <option value="$PROJECT_DIR$/db/migrate/20160804133136_add_image_link_to_kanjai_images.rb" />
144 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/get_gallery.html.erb" /> 171 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/get_gallery.html.erb" />
@@ -150,7 +177,6 @@ @@ -150,7 +177,6 @@
150 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_gallery_exist_images.html.erb" /> 177 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_gallery_exist_images.html.erb" />
151 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/gallery.html.erb" /> 178 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/gallery.html.erb" />
152 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/update_gallery.js.erb" /> 179 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/update_gallery.js.erb" />
153 - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />  
154 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb" /> 180 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb" />
155 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" /> 181 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" />
156 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" /> 182 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
@@ -160,6 +186,8 @@ @@ -160,6 +186,8 @@
160 <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" /> 186 <option value="$PROJECT_DIR$/lib/kanjai/content_function.rb" />
161 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" /> 187 <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb" />
162 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 188 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  189 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
  190 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
163 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 191 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
164 </list> 192 </list>
165 </option> 193 </option>
@@ -310,10 +338,6 @@ @@ -310,10 +338,6 @@
310 <option name="myItemId" value="app" /> 338 <option name="myItemId" value="app" />
311 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 339 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
312 </PATH_ELEMENT> 340 </PATH_ELEMENT>
313 - <PATH_ELEMENT>  
314 - <option name="myItemId" value="views" />  
315 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
316 - </PATH_ELEMENT>  
317 </PATH> 341 </PATH>
318 <PATH> 342 <PATH>
319 <PATH_ELEMENT> 343 <PATH_ELEMENT>
@@ -329,7 +353,7 @@ @@ -329,7 +353,7 @@
329 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 353 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
330 </PATH_ELEMENT> 354 </PATH_ELEMENT>
331 <PATH_ELEMENT> 355 <PATH_ELEMENT>
332 - <option name="myItemId" value="views" /> 356 + <option name="myItemId" value="models" />
333 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 357 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
334 </PATH_ELEMENT> 358 </PATH_ELEMENT>
335 <PATH_ELEMENT> 359 <PATH_ELEMENT>
@@ -351,17 +375,13 @@ @@ -351,17 +375,13 @@
351 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 375 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
352 </PATH_ELEMENT> 376 </PATH_ELEMENT>
353 <PATH_ELEMENT> 377 <PATH_ELEMENT>
354 - <option name="myItemId" value="views" /> 378 + <option name="myItemId" value="controllers" />
355 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 379 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
356 </PATH_ELEMENT> 380 </PATH_ELEMENT>
357 <PATH_ELEMENT> 381 <PATH_ELEMENT>
358 <option name="myItemId" value="kanjai" /> 382 <option name="myItemId" value="kanjai" />
359 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 383 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
360 </PATH_ELEMENT> 384 </PATH_ELEMENT>
361 - <PATH_ELEMENT>  
362 - <option name="myItemId" value="pages" />  
363 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />  
364 - </PATH_ELEMENT>  
365 </PATH> 385 </PATH>
366 <PATH> 386 <PATH>
367 <PATH_ELEMENT> 387 <PATH_ELEMENT>
@@ -376,6 +396,10 @@ @@ -376,6 +396,10 @@
376 <option name="myItemId" value="app" /> 396 <option name="myItemId" value="app" />
377 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 397 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
378 </PATH_ELEMENT> 398 </PATH_ELEMENT>
  399 + <PATH_ELEMENT>
  400 + <option name="myItemId" value="assets" />
  401 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  402 + </PATH_ELEMENT>
379 </PATH> 403 </PATH>
380 <PATH> 404 <PATH>
381 <PATH_ELEMENT> 405 <PATH_ELEMENT>
@@ -391,7 +415,11 @@ @@ -391,7 +415,11 @@
391 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 415 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
392 </PATH_ELEMENT> 416 </PATH_ELEMENT>
393 <PATH_ELEMENT> 417 <PATH_ELEMENT>
394 - <option name="myItemId" value="controllers" /> 418 + <option name="myItemId" value="assets" />
  419 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  420 + </PATH_ELEMENT>
  421 + <PATH_ELEMENT>
  422 + <option name="myItemId" value="javascripts" />
395 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 423 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
396 </PATH_ELEMENT> 424 </PATH_ELEMENT>
397 <PATH_ELEMENT> 425 <PATH_ELEMENT>
@@ -416,6 +444,18 @@ @@ -416,6 +444,18 @@
416 <option name="myItemId" value="assets" /> 444 <option name="myItemId" value="assets" />
417 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 445 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
418 </PATH_ELEMENT> 446 </PATH_ELEMENT>
  447 + <PATH_ELEMENT>
  448 + <option name="myItemId" value="javascripts" />
  449 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  450 + </PATH_ELEMENT>
  451 + <PATH_ELEMENT>
  452 + <option name="myItemId" value="kanjai" />
  453 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  454 + </PATH_ELEMENT>
  455 + <PATH_ELEMENT>
  456 + <option name="myItemId" value="admin" />
  457 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  458 + </PATH_ELEMENT>
419 </PATH> 459 </PATH>
420 </subPane> 460 </subPane>
421 </pane> 461 </pane>
@@ -615,9 +655,7 @@ @@ -615,9 +655,7 @@
615 <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> 655 <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" />
616 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 656 <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" />
617 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 657 <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" />
618 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32229403" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />  
619 - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />  
620 - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> 658 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32714054" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
621 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> 659 <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" />
622 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> 660 <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" />
623 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 661 <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" />
@@ -625,10 +663,12 @@ @@ -625,10 +663,12 @@
625 <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 663 <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" />
626 <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 664 <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" />
627 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> 665 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
  666 + <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" />
628 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> 667 <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" />
629 <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> 668 <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" />
630 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> 669 <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
631 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> 670 <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" />
  671 + <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" />
632 </layout> 672 </layout>
633 </component> 673 </component>
634 <component name="Vcs.Log.UiProperties"> 674 <component name="Vcs.Log.UiProperties">
@@ -654,34 +694,6 @@ @@ -654,34 +694,6 @@
654 <watches-manager /> 694 <watches-manager />
655 </component> 695 </component>
656 <component name="editorHistoryManager"> 696 <component name="editorHistoryManager">
657 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">  
658 - <provider selected="true" editor-type-id="text-editor">  
659 - <state vertical-scroll-proportion="0.0" vertical-offset="807" max-vertical-offset="22110">  
660 - <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />  
661 - </state>  
662 - </provider>  
663 - </entry>  
664 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">  
665 - <provider selected="true" editor-type-id="text-editor">  
666 - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="315">  
667 - <caret line="0" column="42" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="42" />  
668 - </state>  
669 - </provider>  
670 - </entry>  
671 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb">  
672 - <provider selected="true" editor-type-id="text-editor">  
673 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">  
674 - <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />  
675 - </state>  
676 - </provider>  
677 - </entry>  
678 - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">  
679 - <provider selected="true" editor-type-id="text-editor">  
680 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
681 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
682 - </state>  
683 - </provider>  
684 - </entry>  
685 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss"> 697 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
686 <provider selected="true" editor-type-id="text-editor"> 698 <provider selected="true" editor-type-id="text-editor">
687 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 699 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
@@ -801,13 +813,6 @@ @@ -801,13 +813,6 @@
801 </state> 813 </state>
802 </provider> 814 </provider>
803 </entry> 815 </entry>
804 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">  
805 - <provider selected="true" editor-type-id="text-editor">  
806 - <state vertical-scroll-proportion="0.14195584" vertical-offset="435" max-vertical-offset="8550">  
807 - <caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />  
808 - </state>  
809 - </provider>  
810 - </entry>  
811 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb"> 816 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb">
812 <provider selected="true" editor-type-id="text-editor"> 817 <provider selected="true" editor-type-id="text-editor">
813 <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="345"> 818 <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="345">
@@ -857,18 +862,10 @@ @@ -857,18 +862,10 @@
857 </state> 862 </state>
858 </provider> 863 </provider>
859 </entry> 864 </entry>
860 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">  
861 - <provider selected="true" editor-type-id="text-editor">  
862 - <state vertical-scroll-proportion="0.0" vertical-offset="540" max-vertical-offset="7845">  
863 - <caret line="43" column="0" selection-start-line="43" selection-start-column="0" selection-end-line="54" selection-end-column="1" />  
864 - </state>  
865 - </provider>  
866 - </entry>  
867 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb"> 865 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
868 <provider selected="true" editor-type-id="text-editor"> 866 <provider selected="true" editor-type-id="text-editor">
869 <state vertical-scroll-proportion="0.0" vertical-offset="110" max-vertical-offset="660"> 867 <state vertical-scroll-proportion="0.0" vertical-offset="110" max-vertical-offset="660">
870 <caret line="26" column="19" selection-start-line="22" selection-start-column="0" selection-end-line="26" selection-end-column="19" /> 868 <caret line="26" column="19" selection-start-line="22" selection-start-column="0" selection-end-line="26" selection-end-column="19" />
871 - <folding />  
872 </state> 869 </state>
873 </provider> 870 </provider>
874 </entry> 871 </entry>
@@ -884,7 +881,6 @@ @@ -884,7 +881,6 @@
884 <provider selected="true" editor-type-id="text-editor"> 881 <provider selected="true" editor-type-id="text-editor">
885 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416"> 882 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
886 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 883 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
887 - <folding />  
888 </state> 884 </state>
889 </provider> 885 </provider>
890 </entry> 886 </entry>
@@ -912,14 +908,6 @@ @@ -912,14 +908,6 @@
912 </state> 908 </state>
913 </provider> 909 </provider>
914 </entry> 910 </entry>
915 - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">  
916 - <provider selected="true" editor-type-id="text-editor">  
917 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
918 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
919 - <folding />  
920 - </state>  
921 - </provider>  
922 - </entry>  
923 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb"> 911 <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
924 <provider selected="true" editor-type-id="text-editor"> 912 <provider selected="true" editor-type-id="text-editor">
925 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4110"> 913 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="4110">
@@ -948,7 +936,6 @@ @@ -948,7 +936,6 @@
948 <provider selected="true" editor-type-id="text-editor"> 936 <provider selected="true" editor-type-id="text-editor">
949 <state vertical-scroll-proportion="0.26025236" vertical-offset="0" max-vertical-offset="634"> 937 <state vertical-scroll-proportion="0.26025236" vertical-offset="0" max-vertical-offset="634">
950 <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" /> 938 <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
951 - <folding />  
952 </state> 939 </state>
953 </provider> 940 </provider>
954 </entry> 941 </entry>
@@ -992,14 +979,6 @@ @@ -992,14 +979,6 @@
992 </state> 979 </state>
993 </provider> 980 </provider>
994 </entry> 981 </entry>
995 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">  
996 - <provider selected="true" editor-type-id="text-editor">  
997 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">  
998 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />  
999 - <folding />  
1000 - </state>  
1001 - </provider>  
1002 - </entry>  
1003 <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb"> 982 <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
1004 <provider selected="true" editor-type-id="text-editor"> 983 <provider selected="true" editor-type-id="text-editor">
1005 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610"> 984 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
@@ -1016,6 +995,14 @@ @@ -1016,6 +995,14 @@
1016 </state> 995 </state>
1017 </provider> 996 </provider>
1018 </entry> 997 </entry>
  998 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  999 + <provider selected="true" editor-type-id="text-editor">
  1000 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  1001 + <caret line="2" column="31" selection-start-line="2" selection-start-column="31" selection-end-line="2" selection-end-column="31" />
  1002 + <folding />
  1003 + </state>
  1004 + </provider>
  1005 + </entry>
1019 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb"> 1006 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1020 <provider selected="true" editor-type-id="text-editor"> 1007 <provider selected="true" editor-type-id="text-editor">
1021 <state vertical-scroll-proportion="0.0" vertical-offset="375" max-vertical-offset="2805"> 1008 <state vertical-scroll-proportion="0.0" vertical-offset="375" max-vertical-offset="2805">
@@ -1024,6 +1011,72 @@ @@ -1024,6 +1011,72 @@
1024 </state> 1011 </state>
1025 </provider> 1012 </provider>
1026 </entry> 1013 </entry>
  1014 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb">
  1015 + <provider selected="true" editor-type-id="text-editor">
  1016 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1017 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1018 + <folding />
  1019 + </state>
  1020 + </provider>
  1021 + </entry>
  1022 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
  1023 + <provider selected="true" editor-type-id="text-editor">
  1024 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1025 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1026 + <folding />
  1027 + </state>
  1028 + </provider>
  1029 + </entry>
  1030 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  1031 + <provider selected="true" editor-type-id="text-editor">
  1032 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">
  1033 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1034 + <folding />
  1035 + </state>
  1036 + </provider>
  1037 + </entry>
  1038 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  1039 + <provider selected="true" editor-type-id="text-editor">
  1040 + <state vertical-scroll-proportion="-12.291667" vertical-offset="980" max-vertical-offset="1770">
  1041 + <caret line="85" column="124" selection-start-line="85" selection-start-column="124" selection-end-line="85" selection-end-column="124" />
  1042 + <folding />
  1043 + </state>
  1044 + </provider>
  1045 + </entry>
  1046 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
  1047 + <provider selected="true" editor-type-id="text-editor">
  1048 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="22245">
  1049 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1050 + <folding>
  1051 + <element signature="n#!!doc" expanded="true" />
  1052 + </folding>
  1053 + </state>
  1054 + </provider>
  1055 + </entry>
  1056 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  1057 + <provider selected="true" editor-type-id="text-editor">
  1058 + <state vertical-scroll-proportion="0.0" vertical-offset="435" max-vertical-offset="8550">
  1059 + <caret line="35" column="12" selection-start-line="35" selection-start-column="12" selection-end-line="35" selection-end-column="12" />
  1060 + <folding>
  1061 + <marker date="1470228118000" expanded="true" signature="503:515" placeholder="..." />
  1062 + </folding>
  1063 + </state>
  1064 + </provider>
  1065 + </entry>
  1066 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  1067 + <provider selected="true" editor-type-id="text-editor">
  1068 + <state vertical-scroll-proportion="0.0" vertical-offset="2520" max-vertical-offset="7845">
  1069 + <caret line="189" column="26" selection-start-line="189" selection-start-column="26" selection-end-line="189" selection-end-column="26" />
  1070 + <folding>
  1071 + <marker date="1475744650000" expanded="true" signature="1842:1884" placeholder="..." />
  1072 + <marker date="1475744650000" expanded="true" signature="4090:4108" placeholder="..." />
  1073 + <marker date="1475744650000" expanded="true" signature="4122:4140" placeholder="..." />
  1074 + <marker date="1475744650000" expanded="true" signature="4192:4202" placeholder="..." />
  1075 + <marker date="1475744650000" expanded="true" signature="4229:4292" placeholder="..." />
  1076 + </folding>
  1077 + </state>
  1078 + </provider>
  1079 + </entry>
1027 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 1080 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1028 <provider selected="true" editor-type-id="text-editor"> 1081 <provider selected="true" editor-type-id="text-editor">
1029 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 1082 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.61) 4 + kanjai (0.0.62)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -187,7 +187,7 @@ var initAjaxFileUpload = function(selector){ @@ -187,7 +187,7 @@ var initAjaxFileUpload = function(selector){
187 187
188 // extract key and generate URL from response 188 // extract key and generate URL from response
189 var key = $(data.jqXHR.responseXML).find("Key").text(); 189 var key = $(data.jqXHR.responseXML).find("Key").text();
190 - var url = 'http://' + fileInputElem.data('host') + '/' + key; 190 + var url = 'https://' + fileInputElem.data('host') + '/' + key;
191 191
192 // create hidden field 192 // create hidden field
193 var input = $("<input />", {type: 'hidden', name: fileInputElem.attr('name'), value: url}) 193 var input = $("<input />", {type: 'hidden', name: fileInputElem.attr('name'), value: url})
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.62" 2 + VERSION = "0.0.63"
3 end 3 end