EDIT / kanjai · Commits

Commit 1d83a1306a0f55388da9beb53cca0012064c5287

Authored by Karpikau Andrei
1 parent 0f4fcf87

change kanjai version

Inline Side-by-side
Showing 3 changed files with 110 additions and 67 deletions
... ... @@ -35,6 +35,36 @@
35 35 </provider>
36 36 </entry>
37 37 </file>
  38 + <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  40 + <provider selected="true" editor-type-id="text-editor">
  41 + <state vertical-scroll-proportion="-19.791666" vertical-offset="185" max-vertical-offset="825">
  42 + <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
  43 + <folding />
  44 + </state>
  45 + </provider>
  46 + </entry>
  47 + </file>
  48 + <file leaf-file-name="admin_login.html.erb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
  50 + <provider selected="true" editor-type-id="text-editor">
  51 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="390">
  52 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  53 + <folding />
  54 + </state>
  55 + </provider>
  56 + </entry>
  57 + </file>
  58 + <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  60 + <provider selected="true" editor-type-id="text-editor">
  61 + <state vertical-scroll-proportion="0.0" vertical-offset="1395" max-vertical-offset="2925">
  62 + <caret line="123" column="64" selection-start-line="123" selection-start-column="64" selection-end-line="123" selection-end-column="64" />
  63 + <folding />
  64 + </state>
  65 + </provider>
  66 + </entry>
  67 + </file>
38 68 <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false">
39 69 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
40 70 <provider selected="true" editor-type-id="text-editor">
... ... @@ -114,7 +144,6 @@
114 144 <component name="IdeDocumentHistory">
115 145 <option name="CHANGED_PATHS">
116 146 <list>
117   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb" />
118 147 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/edit.html.erb" />
119 148 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/page_langs_controller.rb" />
120 149 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb" />
... ... @@ -164,6 +193,7 @@
164 193 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
165 194 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
166 195 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
  196 + <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
167 197 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
168 198 </list>
169 199 </option>
... ... @@ -266,6 +296,10 @@
266 296 <option name="myItemId" value="views" />
267 297 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
268 298 </PATH_ELEMENT>
  299 + <PATH_ELEMENT>
  300 + <option name="myItemId" value="shared" />
  301 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  302 + </PATH_ELEMENT>
269 303 </PATH>
270 304 <PATH>
271 305 <PATH_ELEMENT>
... ... @@ -285,6 +319,10 @@
285 319 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
286 320 </PATH_ELEMENT>
287 321 <PATH_ELEMENT>
  322 + <option name="myItemId" value="layouts" />
  323 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  324 + </PATH_ELEMENT>
  325 + <PATH_ELEMENT>
288 326 <option name="myItemId" value="kanjai" />
289 327 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
290 328 </PATH_ELEMENT>
... ... @@ -311,11 +349,7 @@
311 349 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
312 350 </PATH_ELEMENT>
313 351 <PATH_ELEMENT>
314   - <option name="myItemId" value="admin" />
315   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
316   - </PATH_ELEMENT>
317   - <PATH_ELEMENT>
318   - <option name="myItemId" value="pages" />
  352 + <option name="myItemId" value="shared" />
319 353 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
320 354 </PATH_ELEMENT>
321 355 </PATH>
... ... @@ -341,17 +375,9 @@
341 375 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
342 376 </PATH_ELEMENT>
343 377 <PATH_ELEMENT>
344   - <option name="myItemId" value="admin" />
345   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
346   - </PATH_ELEMENT>
347   - <PATH_ELEMENT>
348 378 <option name="myItemId" value="pages" />
349 379 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
350 380 </PATH_ELEMENT>
351   - <PATH_ELEMENT>
352   - <option name="myItemId" value="content_types" />
353   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
354   - </PATH_ELEMENT>
355 381 </PATH>
356 382 <PATH>
357 383 <PATH_ELEMENT>
... ... @@ -375,7 +401,11 @@
375 401 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
376 402 </PATH_ELEMENT>
377 403 <PATH_ELEMENT>
378   - <option name="myItemId" value="admin" />
  404 + <option name="myItemId" value="client" />
  405 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  406 + </PATH_ELEMENT>
  407 + <PATH_ELEMENT>
  408 + <option name="myItemId" value="page" />
379 409 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
380 410 </PATH_ELEMENT>
381 411 </PATH>
... ... @@ -404,10 +434,6 @@
404 434 <option name="myItemId" value="admin" />
405 435 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
406 436 </PATH_ELEMENT>
407   - <PATH_ELEMENT>
408   - <option name="myItemId" value="page_contents" />
409   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
410   - </PATH_ELEMENT>
411 437 </PATH>
412 438 <PATH>
413 439 <PATH_ELEMENT>
... ... @@ -422,6 +448,10 @@
422 448 <option name="myItemId" value="app" />
423 449 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
424 450 </PATH_ELEMENT>
  451 + <PATH_ELEMENT>
  452 + <option name="myItemId" value="views" />
  453 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  454 + </PATH_ELEMENT>
425 455 </PATH>
426 456 <PATH>
427 457 <PATH_ELEMENT>
... ... @@ -437,7 +467,11 @@
437 467 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
438 468 </PATH_ELEMENT>
439 469 <PATH_ELEMENT>
440   - <option name="myItemId" value="assets" />
  470 + <option name="myItemId" value="models" />
  471 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  472 + </PATH_ELEMENT>
  473 + <PATH_ELEMENT>
  474 + <option name="myItemId" value="kanjai" />
441 475 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
442 476 </PATH_ELEMENT>
443 477 </PATH>
... ... @@ -454,12 +488,22 @@
454 488 <option name="myItemId" value="app" />
455 489 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
456 490 </PATH_ELEMENT>
  491 + </PATH>
  492 + <PATH>
457 493 <PATH_ELEMENT>
458   - <option name="myItemId" value="assets" />
  494 + <option name="myItemId" value="kanjai" />
  495 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  496 + </PATH_ELEMENT>
  497 + <PATH_ELEMENT>
  498 + <option name="myItemId" value="kanjai" />
  499 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  500 + </PATH_ELEMENT>
  501 + <PATH_ELEMENT>
  502 + <option name="myItemId" value="app" />
459 503 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
460 504 </PATH_ELEMENT>
461 505 <PATH_ELEMENT>
462   - <option name="myItemId" value="javascripts" />
  506 + <option name="myItemId" value="controllers" />
463 507 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
464 508 </PATH_ELEMENT>
465 509 <PATH_ELEMENT>
... ... @@ -481,11 +525,7 @@
481 525 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
482 526 </PATH_ELEMENT>
483 527 <PATH_ELEMENT>
484   - <option name="myItemId" value="assets" />
485   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
486   - </PATH_ELEMENT>
487   - <PATH_ELEMENT>
488   - <option name="myItemId" value="javascripts" />
  528 + <option name="myItemId" value="controllers" />
489 529 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
490 530 </PATH_ELEMENT>
491 531 <PATH_ELEMENT>
... ... @@ -493,7 +533,7 @@
493 533 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
494 534 </PATH_ELEMENT>
495 535 <PATH_ELEMENT>
496   - <option name="myItemId" value="frontend" />
  536 + <option name="myItemId" value="admin" />
497 537 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
498 538 </PATH_ELEMENT>
499 539 </PATH>
... ... @@ -514,18 +554,6 @@
514 554 <option name="myItemId" value="assets" />
515 555 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
516 556 </PATH_ELEMENT>
517   - <PATH_ELEMENT>
518   - <option name="myItemId" value="javascripts" />
519   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
520   - </PATH_ELEMENT>
521   - <PATH_ELEMENT>
522   - <option name="myItemId" value="kanjai" />
523   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
524   - </PATH_ELEMENT>
525   - <PATH_ELEMENT>
526   - <option name="myItemId" value="admin" />
527   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
528   - </PATH_ELEMENT>
529 557 </PATH>
530 558 </subPane>
531 559 </pane>
... ... @@ -760,13 +788,6 @@
760 788 <watches-manager />
761 789 </component>
762 790 <component name="editorHistoryManager">
763   - <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
764   - <provider selected="true" editor-type-id="text-editor">
765   - <state vertical-scroll-proportion="0.0" vertical-offset="915" max-vertical-offset="1845">
766   - <caret line="77" column="18" selection-start-line="77" selection-start-column="18" selection-end-line="77" selection-end-column="18" />
767   - </state>
768   - </provider>
769   - </entry>
770 791 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
771 792 <provider selected="true" editor-type-id="text-editor">
772 793 <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="300">
... ... @@ -774,13 +795,6 @@
774 795 </state>
775 796 </provider>
776 797 </entry>
777   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
778   - <provider selected="true" editor-type-id="text-editor">
779   - <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
780   - <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
781   - </state>
782   - </provider>
783   - </entry>
784 798 <entry file="file://$PROJECT_DIR$/Gemfile">
785 799 <provider selected="true" editor-type-id="text-editor">
786 800 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
... ... @@ -943,13 +957,6 @@
943 957 </state>
944 958 </provider>
945 959 </entry>
946   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
947   - <provider selected="true" editor-type-id="text-editor">
948   - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="2745">
949   - <caret line="22" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
950   - </state>
951   - </provider>
952   - </entry>
953 960 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
954 961 <provider selected="true" editor-type-id="text-editor">
955 962 <state vertical-scroll-proportion="-8.851851" vertical-offset="1261" max-vertical-offset="1650">
... ... @@ -1138,6 +1145,30 @@
1138 1145 </state>
1139 1146 </provider>
1140 1147 </entry>
  1148 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  1149 + <provider selected="true" editor-type-id="text-editor">
  1150 + <state vertical-scroll-proportion="-19.791666" vertical-offset="185" max-vertical-offset="825">
  1151 + <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
  1152 + <folding />
  1153 + </state>
  1154 + </provider>
  1155 + </entry>
  1156 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
  1157 + <provider selected="true" editor-type-id="text-editor">
  1158 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1159 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1160 + <folding />
  1161 + </state>
  1162 + </provider>
  1163 + </entry>
  1164 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  1165 + <provider selected="true" editor-type-id="text-editor">
  1166 + <state vertical-scroll-proportion="0.0" vertical-offset="1395" max-vertical-offset="2925">
  1167 + <caret line="123" column="64" selection-start-line="123" selection-start-column="64" selection-end-line="123" selection-end-column="64" />
  1168 + <folding />
  1169 + </state>
  1170 + </provider>
  1171 + </entry>
1141 1172 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1142 1173 <provider selected="true" editor-type-id="text-editor">
1143 1174 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
... ...
... ... @@ -117,11 +117,23 @@ module Kanjai
117 117 content = doc.to_html
118 118 end
119 119
120   - S3_BUCKET.put_object({
121   - acl: 'public-read',
122   - body: content,
123   - key: self.template_content_path + file_name
124   - })
  120 + if File.extname(file_name) == '.css'
  121 + S3_BUCKET.put_object({
  122 + acl: 'public-read',
  123 + body: content,
  124 + content_type: 'text/css',
  125 + key: self.template_content_path + file_name
  126 + })
  127 + else
  128 + S3_BUCKET.put_object({
  129 + acl: 'public-read',
  130 + body: content,
  131 + key: self.template_content_path + file_name
  132 + })
  133 + end
  134 +
  135 +
  136 +
125 137
126 138 end
127 139
... ...
1 1 module Kanjai
2   - VERSION = "0.0.54"
  2 + VERSION = "0.0.55"
3 3 end
... ...