EDIT / kanjai · Commits

Commit 776911d198680d7c1562b3fb454a82686b5a221f

Authored by Karpikau Andrei
1 parent 1b811a9a

make sort content type

Inline Side-by-side
Showing 4 changed files with 341 additions and 115 deletions
... ... @@ -25,100 +25,103 @@
25 25 </component>
26 26 <component name="FileEditorManager">
27 27 <leaf>
28   - <file leaf-file-name="frontend_extend.css.scss" pinned="false" current-in-tab="false">
29   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
  28 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  29 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
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.023659306" vertical-offset="0" max-vertical-offset="634">
  32 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
33 33 <folding />
34 34 </state>
35 35 </provider>
36 36 </entry>
37 37 </file>
38   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
39   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  38 + <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
40 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
42   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  41 + <state vertical-scroll-proportion="2.0833333" vertical-offset="770" max-vertical-offset="1380">
  42 + <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
43 43 <folding />
44 44 </state>
45 45 </provider>
46 46 </entry>
47 47 </file>
48   - <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  48 + <file leaf-file-name="_operation.html.erb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
50 50 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="0.0" vertical-offset="210" max-vertical-offset="1410">
52   - <caret line="25" column="16" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="16" />
  51 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="315">
  52 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
53 53 <folding />
54 54 </state>
55 55 </provider>
56 56 </entry>
57 57 </file>
58   - <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  58 + <file leaf-file-name="_preview.html.erb" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
60 60 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="0.0" vertical-offset="240" max-vertical-offset="390">
62   - <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
  61 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="195">
  62 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
63 63 <folding />
64 64 </state>
65 65 </provider>
66 66 </entry>
67 67 </file>
68   - <file leaf-file-name="README.rdoc" pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/README.rdoc">
  68 + <file leaf-file-name="structure.html.erb" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
70 70 <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="120">
  71 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="675">
72 72 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
73 73 <folding />
74 74 </state>
75 75 </provider>
76 76 </entry>
77 77 </file>
78   - <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
79   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  78 + <file leaf-file-name="show_editor.html.erb" pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
80 80 <provider selected="true" editor-type-id="text-editor">
81   - <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="1140">
82   - <caret line="47" column="27" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="27" />
  81 + <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615">
  82 + <caret line="6" column="61" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="61" />
83 83 <folding />
84 84 </state>
85 85 </provider>
86 86 </entry>
87 87 </file>
88   - <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
89   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  88 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
90 90 <provider selected="true" editor-type-id="text-editor">
91   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="180">
92   - <caret line="5" column="9" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="9" />
93   - <folding />
  91 + <state vertical-scroll-proportion="-13.592592" vertical-offset="1118" max-vertical-offset="4275">
  92 + <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" />
  93 + <folding>
  94 + <element signature="e#2689#2725#0" expanded="true" />
  95 + <element signature="e#2768#2808#0" expanded="true" />
  96 + </folding>
94 97 </state>
95 98 </provider>
96 99 </entry>
97 100 </file>
98   - <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
99   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  101 + <file leaf-file-name="add_item.html.erb" pinned="false" current-in-tab="false">
  102 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_contents/add_item.html.erb">
100 103 <provider selected="true" editor-type-id="text-editor">
101   - <state vertical-scroll-proportion="0.0" vertical-offset="330" max-vertical-offset="2745">
102   - <caret line="39" column="37" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" />
  104 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="810">
  105 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
103 106 <folding />
104 107 </state>
105 108 </provider>
106 109 </entry>
107 110 </file>
108   - <file leaf-file-name="template_parser.rb" pinned="false" current-in-tab="false">
109   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
  111 + <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
  112 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
110 113 <provider selected="true" editor-type-id="text-editor">
111   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
112   - <caret line="71" column="40" selection-start-line="71" selection-start-column="40" selection-end-line="71" selection-end-column="40" />
  114 + <state vertical-scroll-proportion="15.0" vertical-offset="360" max-vertical-offset="1470">
  115 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
113 116 <folding />
114 117 </state>
115 118 </provider>
116 119 </entry>
117 120 </file>
118   - <file leaf-file-name="frontend_extend.js" pinned="false" current-in-tab="false">
119   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
  121 + <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
  122 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
120 123 <provider selected="true" editor-type-id="text-editor">
121   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  124 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="615">
122 125 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
123 126 <folding />
124 127 </state>
... ... @@ -168,7 +171,6 @@
168 171 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
169 172 <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
170 173 <option value="$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb" />
171   - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
172 174 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb" />
173 175 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
174 176 <option value="$PROJECT_DIR$/config/locales/en.yml" />
... ... @@ -180,6 +182,7 @@
180 182 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
181 183 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
182 184 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
  185 + <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
183 186 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
184 187 </list>
185 188 </option>
... ... @@ -280,6 +283,188 @@
280 283 <option name="myItemId" value="app" />
281 284 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
282 285 </PATH_ELEMENT>
  286 + <PATH_ELEMENT>
  287 + <option name="myItemId" value="views" />
  288 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  289 + </PATH_ELEMENT>
  290 + </PATH>
  291 + <PATH>
  292 + <PATH_ELEMENT>
  293 + <option name="myItemId" value="kanjai" />
  294 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  295 + </PATH_ELEMENT>
  296 + <PATH_ELEMENT>
  297 + <option name="myItemId" value="kanjai" />
  298 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  299 + </PATH_ELEMENT>
  300 + <PATH_ELEMENT>
  301 + <option name="myItemId" value="app" />
  302 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  303 + </PATH_ELEMENT>
  304 + <PATH_ELEMENT>
  305 + <option name="myItemId" value="views" />
  306 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  307 + </PATH_ELEMENT>
  308 + <PATH_ELEMENT>
  309 + <option name="myItemId" value="kanjai" />
  310 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  311 + </PATH_ELEMENT>
  312 + </PATH>
  313 + <PATH>
  314 + <PATH_ELEMENT>
  315 + <option name="myItemId" value="kanjai" />
  316 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  317 + </PATH_ELEMENT>
  318 + <PATH_ELEMENT>
  319 + <option name="myItemId" value="kanjai" />
  320 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  321 + </PATH_ELEMENT>
  322 + <PATH_ELEMENT>
  323 + <option name="myItemId" value="app" />
  324 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  325 + </PATH_ELEMENT>
  326 + <PATH_ELEMENT>
  327 + <option name="myItemId" value="views" />
  328 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  329 + </PATH_ELEMENT>
  330 + <PATH_ELEMENT>
  331 + <option name="myItemId" value="kanjai" />
  332 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  333 + </PATH_ELEMENT>
  334 + <PATH_ELEMENT>
  335 + <option name="myItemId" value="admin" />
  336 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  337 + </PATH_ELEMENT>
  338 + <PATH_ELEMENT>
  339 + <option name="myItemId" value="pages" />
  340 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  341 + </PATH_ELEMENT>
  342 + </PATH>
  343 + <PATH>
  344 + <PATH_ELEMENT>
  345 + <option name="myItemId" value="kanjai" />
  346 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  347 + </PATH_ELEMENT>
  348 + <PATH_ELEMENT>
  349 + <option name="myItemId" value="kanjai" />
  350 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  351 + </PATH_ELEMENT>
  352 + <PATH_ELEMENT>
  353 + <option name="myItemId" value="app" />
  354 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  355 + </PATH_ELEMENT>
  356 + <PATH_ELEMENT>
  357 + <option name="myItemId" value="views" />
  358 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  359 + </PATH_ELEMENT>
  360 + <PATH_ELEMENT>
  361 + <option name="myItemId" value="kanjai" />
  362 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  363 + </PATH_ELEMENT>
  364 + <PATH_ELEMENT>
  365 + <option name="myItemId" value="admin" />
  366 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  367 + </PATH_ELEMENT>
  368 + <PATH_ELEMENT>
  369 + <option name="myItemId" value="pages" />
  370 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  371 + </PATH_ELEMENT>
  372 + <PATH_ELEMENT>
  373 + <option name="myItemId" value="content_types" />
  374 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  375 + </PATH_ELEMENT>
  376 + </PATH>
  377 + <PATH>
  378 + <PATH_ELEMENT>
  379 + <option name="myItemId" value="kanjai" />
  380 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  381 + </PATH_ELEMENT>
  382 + <PATH_ELEMENT>
  383 + <option name="myItemId" value="kanjai" />
  384 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  385 + </PATH_ELEMENT>
  386 + <PATH_ELEMENT>
  387 + <option name="myItemId" value="app" />
  388 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  389 + </PATH_ELEMENT>
  390 + <PATH_ELEMENT>
  391 + <option name="myItemId" value="views" />
  392 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  393 + </PATH_ELEMENT>
  394 + <PATH_ELEMENT>
  395 + <option name="myItemId" value="kanjai" />
  396 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  397 + </PATH_ELEMENT>
  398 + <PATH_ELEMENT>
  399 + <option name="myItemId" value="admin" />
  400 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  401 + </PATH_ELEMENT>
  402 + </PATH>
  403 + <PATH>
  404 + <PATH_ELEMENT>
  405 + <option name="myItemId" value="kanjai" />
  406 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  407 + </PATH_ELEMENT>
  408 + <PATH_ELEMENT>
  409 + <option name="myItemId" value="kanjai" />
  410 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  411 + </PATH_ELEMENT>
  412 + <PATH_ELEMENT>
  413 + <option name="myItemId" value="app" />
  414 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  415 + </PATH_ELEMENT>
  416 + <PATH_ELEMENT>
  417 + <option name="myItemId" value="views" />
  418 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  419 + </PATH_ELEMENT>
  420 + <PATH_ELEMENT>
  421 + <option name="myItemId" value="kanjai" />
  422 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  423 + </PATH_ELEMENT>
  424 + <PATH_ELEMENT>
  425 + <option name="myItemId" value="admin" />
  426 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  427 + </PATH_ELEMENT>
  428 + <PATH_ELEMENT>
  429 + <option name="myItemId" value="page_contents" />
  430 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  431 + </PATH_ELEMENT>
  432 + </PATH>
  433 + <PATH>
  434 + <PATH_ELEMENT>
  435 + <option name="myItemId" value="kanjai" />
  436 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  437 + </PATH_ELEMENT>
  438 + <PATH_ELEMENT>
  439 + <option name="myItemId" value="kanjai" />
  440 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  441 + </PATH_ELEMENT>
  442 + <PATH_ELEMENT>
  443 + <option name="myItemId" value="app" />
  444 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  445 + </PATH_ELEMENT>
  446 + <PATH_ELEMENT>
  447 + <option name="myItemId" value="models" />
  448 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  449 + </PATH_ELEMENT>
  450 + <PATH_ELEMENT>
  451 + <option name="myItemId" value="kanjai" />
  452 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  453 + </PATH_ELEMENT>
  454 + </PATH>
  455 + <PATH>
  456 + <PATH_ELEMENT>
  457 + <option name="myItemId" value="kanjai" />
  458 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  459 + </PATH_ELEMENT>
  460 + <PATH_ELEMENT>
  461 + <option name="myItemId" value="kanjai" />
  462 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  463 + </PATH_ELEMENT>
  464 + <PATH_ELEMENT>
  465 + <option name="myItemId" value="app" />
  466 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  467 + </PATH_ELEMENT>
283 468 </PATH>
284 469 <PATH>
285 470 <PATH_ELEMENT>
... ... @@ -317,6 +502,32 @@
317 502 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
318 503 </PATH_ELEMENT>
319 504 <PATH_ELEMENT>
  505 + <option name="myItemId" value="controllers" />
  506 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  507 + </PATH_ELEMENT>
  508 + <PATH_ELEMENT>
  509 + <option name="myItemId" value="kanjai" />
  510 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  511 + </PATH_ELEMENT>
  512 + <PATH_ELEMENT>
  513 + <option name="myItemId" value="admin" />
  514 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  515 + </PATH_ELEMENT>
  516 + </PATH>
  517 + <PATH>
  518 + <PATH_ELEMENT>
  519 + <option name="myItemId" value="kanjai" />
  520 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  521 + </PATH_ELEMENT>
  522 + <PATH_ELEMENT>
  523 + <option name="myItemId" value="kanjai" />
  524 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  525 + </PATH_ELEMENT>
  526 + <PATH_ELEMENT>
  527 + <option name="myItemId" value="app" />
  528 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  529 + </PATH_ELEMENT>
  530 + <PATH_ELEMENT>
320 531 <option name="myItemId" value="assets" />
321 532 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
322 533 </PATH_ELEMENT>
... ... @@ -506,22 +717,22 @@
506 717 <layout>
507 718 <window_info id="Changes" 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" />
508 719 <window_info id="Terminal" 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" />
509   - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
510 720 <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" />
511   - <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" />
512   - <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" />
513   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.411147" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
514   - <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" />
  721 + <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" />
  722 + <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" />
515 723 <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" />
  724 + <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" />
516 725 <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" />
  726 + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  727 + <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" />
  728 + <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" />
  729 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.411147" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  730 + <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" />
517 731 <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" />
518 732 <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" />
519   - <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" />
520 733 <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" />
521   - <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" />
522 734 <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" />
523 735 <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" />
524   - <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" />
525 736 <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" />
526 737 <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" />
527 738 </layout>
... ... @@ -547,48 +758,6 @@
547 758 <watches-manager />
548 759 </component>
549 760 <component name="editorHistoryManager">
550   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/404.html.erb">
551   - <provider selected="true" editor-type-id="text-editor">
552   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
553   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
554   - </state>
555   - </provider>
556   - </entry>
557   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/admin_user.rb">
558   - <provider selected="true" editor-type-id="text-editor">
559   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
560   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
561   - </state>
562   - </provider>
563   - </entry>
564   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
565   - <provider selected="true" editor-type-id="text-editor">
566   - <state vertical-scroll-proportion="0.0" vertical-offset="473" max-vertical-offset="2055">
567   - <caret line="56" column="69" selection-start-line="56" selection-start-column="69" selection-end-line="56" selection-end-column="69" />
568   - </state>
569   - </provider>
570   - </entry>
571   - <entry file="file://$PROJECT_DIR$/.ruby-version">
572   - <provider selected="true" editor-type-id="text-editor">
573   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
574   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
575   - </state>
576   - </provider>
577   - </entry>
578   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
579   - <provider selected="true" editor-type-id="text-editor">
580   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
581   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
582   - </state>
583   - </provider>
584   - </entry>
585   - <entry file="file://$PROJECT_DIR$/db/migrate/20160423203127_add_lang_to_page_content_markers.rb">
586   - <provider selected="true" editor-type-id="text-editor">
587   - <state vertical-scroll-proportion="0.04731861" vertical-offset="0" max-vertical-offset="634">
588   - <caret line="2" column="59" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="59" />
589   - </state>
590   - </provider>
591   - </entry>
592 761 <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
593 762 <provider selected="true" editor-type-id="text-editor">
594 763 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
... ... @@ -596,20 +765,6 @@
596 765 </state>
597 766 </provider>
598 767 </entry>
599   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
600   - <provider selected="true" editor-type-id="text-editor">
601   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
602   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
603   - </state>
604   - </provider>
605   - </entry>
606   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
607   - <provider selected="true" editor-type-id="text-editor">
608   - <state vertical-scroll-proportion="0.0" vertical-offset="3596" max-vertical-offset="4230">
609   - <caret line="250" column="136" selection-start-line="250" selection-start-column="120" selection-end-line="250" selection-end-column="136" />
610   - </state>
611   - </provider>
612   - </entry>
613 768 <entry file="file://$PROJECT_DIR$/config/locales/de.yml">
614 769 <provider selected="true" editor-type-id="text-editor">
615 770 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -617,13 +772,6 @@
617 772 </state>
618 773 </provider>
619 774 </entry>
620   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
621   - <provider selected="true" editor-type-id="text-editor">
622   - <state vertical-scroll-proportion="0.0" vertical-offset="320" max-vertical-offset="1380">
623   - <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
624   - </state>
625   - </provider>
626   - </entry>
627 775 <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
628 776 <provider selected="true" editor-type-id="text-editor">
629 777 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="150">
... ... @@ -913,6 +1061,81 @@
913 1061 </state>
914 1062 </provider>
915 1063 </entry>
  1064 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
  1065 + <provider selected="true" editor-type-id="text-editor">
  1066 + <state vertical-scroll-proportion="2.0833333" vertical-offset="770" max-vertical-offset="1380">
  1067 + <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
  1068 + <folding />
  1069 + </state>
  1070 + </provider>
  1071 + </entry>
  1072 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_contents/add_item.html.erb">
  1073 + <provider selected="true" editor-type-id="text-editor">
  1074 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="810">
  1075 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1076 + <folding />
  1077 + </state>
  1078 + </provider>
  1079 + </entry>
  1080 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  1081 + <provider selected="true" editor-type-id="text-editor">
  1082 + <state vertical-scroll-proportion="15.0" vertical-offset="360" max-vertical-offset="1470">
  1083 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1084 + <folding />
  1085 + </state>
  1086 + </provider>
  1087 + </entry>
  1088 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
  1089 + <provider selected="true" editor-type-id="text-editor">
  1090 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="615">
  1091 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1092 + <folding />
  1093 + </state>
  1094 + </provider>
  1095 + </entry>
  1096 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
  1097 + <provider selected="true" editor-type-id="text-editor">
  1098 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1099 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1100 + <folding />
  1101 + </state>
  1102 + </provider>
  1103 + </entry>
  1104 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
  1105 + <provider selected="true" editor-type-id="text-editor">
  1106 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1107 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1108 + <folding />
  1109 + </state>
  1110 + </provider>
  1111 + </entry>
  1112 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
  1113 + <provider selected="true" editor-type-id="text-editor">
  1114 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
  1115 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1116 + <folding />
  1117 + </state>
  1118 + </provider>
  1119 + </entry>
  1120 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
  1121 + <provider selected="true" editor-type-id="text-editor">
  1122 + <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615">
  1123 + <caret line="6" column="61" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="61" />
  1124 + <folding />
  1125 + </state>
  1126 + </provider>
  1127 + </entry>
  1128 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  1129 + <provider selected="true" editor-type-id="text-editor">
  1130 + <state vertical-scroll-proportion="-13.592592" vertical-offset="1118" max-vertical-offset="4275">
  1131 + <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" />
  1132 + <folding>
  1133 + <element signature="e#2689#2725#0" expanded="true" />
  1134 + <element signature="e#2768#2808#0" expanded="true" />
  1135 + </folding>
  1136 + </state>
  1137 + </provider>
  1138 + </entry>
916 1139 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
917 1140 <provider selected="true" editor-type-id="text-editor">
918 1141 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.45)
  4 + kanjai (0.0.46)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -93,12 +93,15 @@ module Kanjai
93 93
94 94 @type_contents = []
95 95
96   - @type_contents << [I18n.t('admin.content_types.rte_editor'), 'rte_editor']
97   - @type_contents << [I18n.t('admin.content_types.plugin'), 'plugin']
98 96 if page_template = @page_data.page.page_template
99 97 @type_contents += page_template.template_parts.where("part_type in ('content')").collect{|p| [p.name, p.code] }
100 98 end
101 99
  100 + @type_contents.sort!{|x,y| x[0] <=> y[0]}
  101 +
  102 + @type_contents.unshift([I18n.t('admin.content_types.plugin'), 'plugin'])
  103 + @type_contents.unshift([I18n.t('admin.content_types.rte_editor'), 'rte_editor'])
  104 +
102 105
103 106 @type_content = @obj.type_content
104 107
... ...
1 1 module Kanjai
2   - VERSION = "0.0.46"
  2 + VERSION = "0.0.47"
3 3 end
... ...