EDIT / kanjai · Commits

Commit 2b9db4b470572aea07146dcb6acccc5047ea9e56

Authored by Karpikau Andrei
1 parent 0f2cfdd0

change kanjai version

Inline Side-by-side
Showing 4 changed files with 45 additions and 124 deletions
... ... @@ -64,8 +64,8 @@
64 64 <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
65 65 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
66 66 <provider selected="true" editor-type-id="text-editor">
67   - <state vertical-scroll-proportion="-7.4814816" vertical-offset="728" max-vertical-offset="1410">
68   - <caret line="62" column="33" selection-start-line="62" selection-start-column="24" selection-end-line="62" selection-end-column="33" />
  67 + <state vertical-scroll-proportion="-10.259259" vertical-offset="728" max-vertical-offset="1410">
  68 + <caret line="67" column="10" selection-start-line="67" selection-start-column="10" selection-end-line="67" selection-end-column="10" />
69 69 <folding />
70 70 </state>
71 71 </provider>
... ... @@ -91,6 +91,19 @@
91 91 </provider>
92 92 </entry>
93 93 </file>
  94 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  95 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  96 + <provider selected="true" editor-type-id="text-editor">
  97 + <state vertical-scroll-proportion="0.0" vertical-offset="495" max-vertical-offset="4275">
  98 + <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" />
  99 + <folding>
  100 + <element signature="e#2689#2725#0" expanded="true" />
  101 + <element signature="e#2768#2808#0" expanded="true" />
  102 + </folding>
  103 + </state>
  104 + </provider>
  105 + </entry>
  106 + </file>
94 107 <file leaf-file-name="frontend_extend.js" pinned="false" current-in-tab="false">
95 108 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
96 109 <provider selected="true" editor-type-id="text-editor">
... ... @@ -121,16 +134,6 @@
121 134 </provider>
122 135 </entry>
123 136 </file>
124   - <file leaf-file-name="page_templates_controller.rb" pinned="false" current-in-tab="false">
125   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
126   - <provider selected="true" editor-type-id="text-editor">
127   - <state vertical-scroll-proportion="-8.851851" vertical-offset="1261" max-vertical-offset="1650">
128   - <caret line="100" column="144" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="144" />
129   - <folding />
130   - </state>
131   - </provider>
132   - </entry>
133   - </file>
134 137 </leaf>
135 138 </component>
136 139 <component name="IdeDocumentHistory">
... ... @@ -168,7 +171,6 @@
168 171 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
169 172 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
170 173 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
171   - <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
172 174 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
173 175 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
174 176 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
... ... @@ -186,6 +188,7 @@
186 188 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
187 189 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
188 190 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
  191 + <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
189 192 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
190 193 </list>
191 194 </option>
... ... @@ -325,62 +328,6 @@
325 328 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
326 329 </PATH_ELEMENT>
327 330 <PATH_ELEMENT>
328   - <option name="myItemId" value="views" />
329   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
330   - </PATH_ELEMENT>
331   - <PATH_ELEMENT>
332   - <option name="myItemId" value="kanjai" />
333   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
334   - </PATH_ELEMENT>
335   - <PATH_ELEMENT>
336   - <option name="myItemId" value="admin" />
337   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
338   - </PATH_ELEMENT>
339   - </PATH>
340   - <PATH>
341   - <PATH_ELEMENT>
342   - <option name="myItemId" value="kanjai" />
343   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
344   - </PATH_ELEMENT>
345   - <PATH_ELEMENT>
346   - <option name="myItemId" value="kanjai" />
347   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
348   - </PATH_ELEMENT>
349   - <PATH_ELEMENT>
350   - <option name="myItemId" value="app" />
351   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
352   - </PATH_ELEMENT>
353   - <PATH_ELEMENT>
354   - <option name="myItemId" value="views" />
355   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
356   - </PATH_ELEMENT>
357   - <PATH_ELEMENT>
358   - <option name="myItemId" value="kanjai" />
359   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
360   - </PATH_ELEMENT>
361   - <PATH_ELEMENT>
362   - <option name="myItemId" value="admin" />
363   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
364   - </PATH_ELEMENT>
365   - <PATH_ELEMENT>
366   - <option name="myItemId" value="page_templates" />
367   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
368   - </PATH_ELEMENT>
369   - </PATH>
370   - <PATH>
371   - <PATH_ELEMENT>
372   - <option name="myItemId" value="kanjai" />
373   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
374   - </PATH_ELEMENT>
375   - <PATH_ELEMENT>
376   - <option name="myItemId" value="kanjai" />
377   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
378   - </PATH_ELEMENT>
379   - <PATH_ELEMENT>
380   - <option name="myItemId" value="app" />
381   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
382   - </PATH_ELEMENT>
383   - <PATH_ELEMENT>
384 331 <option name="myItemId" value="models" />
385 332 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
386 333 </PATH_ELEMENT>
... ... @@ -439,32 +386,6 @@
439 386 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
440 387 </PATH_ELEMENT>
441 388 <PATH_ELEMENT>
442   - <option name="myItemId" value="controllers" />
443   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
444   - </PATH_ELEMENT>
445   - <PATH_ELEMENT>
446   - <option name="myItemId" value="kanjai" />
447   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
448   - </PATH_ELEMENT>
449   - <PATH_ELEMENT>
450   - <option name="myItemId" value="admin" />
451   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
452   - </PATH_ELEMENT>
453   - </PATH>
454   - <PATH>
455   - <PATH_ELEMENT>
456   - <option name="myItemId" value="kanjai" />
457   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
458   - </PATH_ELEMENT>
459   - <PATH_ELEMENT>
460   - <option name="myItemId" value="kanjai" />
461   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
462   - </PATH_ELEMENT>
463   - <PATH_ELEMENT>
464   - <option name="myItemId" value="app" />
465   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
466   - </PATH_ELEMENT>
467   - <PATH_ELEMENT>
468 389 <option name="myItemId" value="assets" />
469 390 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
470 391 </PATH_ELEMENT>
... ... @@ -665,7 +586,7 @@
665 586 <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" />
666 587 <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" />
667 588 <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" />
668   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.41760904" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  589 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.41760904" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
669 590 <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" />
670 591 <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" />
671 592 <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" />
... ... @@ -1000,17 +921,6 @@
1000 921 </state>
1001 922 </provider>
1002 923 </entry>
1003   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
1004   - <provider selected="true" editor-type-id="text-editor">
1005   - <state vertical-scroll-proportion="0.0" vertical-offset="1118" max-vertical-offset="4275">
1006   - <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" />
1007   - <folding>
1008   - <element signature="e#2689#2725#0" expanded="true" />
1009   - <element signature="e#2768#2808#0" expanded="true" />
1010   - </folding>
1011   - </state>
1012   - </provider>
1013   - </entry>
1014 924 <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
1015 925 <provider selected="true" editor-type-id="text-editor">
1016 926 <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="2745">
... ... @@ -1035,14 +945,6 @@
1035 945 </state>
1036 946 </provider>
1037 947 </entry>
1038   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1039   - <provider selected="true" editor-type-id="text-editor">
1040   - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="2565">
1041   - <caret line="20" column="71" selection-start-line="20" selection-start-column="71" selection-end-line="20" selection-end-column="71" />
1042   - <folding />
1043   - </state>
1044   - </provider>
1045   - </entry>
1046 948 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
1047 949 <provider selected="true" editor-type-id="text-editor">
1048 950 <state vertical-scroll-proportion="-10.625" vertical-offset="60" max-vertical-offset="660">
... ... @@ -1081,18 +983,37 @@
1081 983 </state>
1082 984 </provider>
1083 985 </entry>
1084   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  986 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
1085 987 <provider selected="true" editor-type-id="text-editor">
1086   - <state vertical-scroll-proportion="-7.4814816" vertical-offset="728" max-vertical-offset="1410">
1087   - <caret line="62" column="33" selection-start-line="62" selection-start-column="24" selection-end-line="62" selection-end-column="33" />
  988 + <state vertical-scroll-proportion="0.0" vertical-offset="1290" max-vertical-offset="4395">
  989 + <caret line="118" column="109" selection-start-line="118" selection-start-column="109" selection-end-line="118" selection-end-column="109" />
1088 990 <folding />
1089 991 </state>
1090 992 </provider>
1091 993 </entry>
1092   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  994 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
1093 995 <provider selected="true" editor-type-id="text-editor">
1094   - <state vertical-scroll-proportion="0.0" vertical-offset="1290" max-vertical-offset="4395">
1095   - <caret line="118" column="109" selection-start-line="118" selection-start-column="109" selection-end-line="118" selection-end-column="109" />
  996 + <state vertical-scroll-proportion="0.0" vertical-offset="1118" max-vertical-offset="4275">
  997 + <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" />
  998 + <folding>
  999 + <element signature="e#2689#2725#0" expanded="true" />
  1000 + <element signature="e#2768#2808#0" expanded="true" />
  1001 + </folding>
  1002 + </state>
  1003 + </provider>
  1004 + </entry>
  1005 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1006 + <provider selected="true" editor-type-id="text-editor">
  1007 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="2565">
  1008 + <caret line="20" column="71" selection-start-line="20" selection-start-column="71" selection-end-line="20" selection-end-column="71" />
  1009 + <folding />
  1010 + </state>
  1011 + </provider>
  1012 + </entry>
  1013 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  1014 + <provider selected="true" editor-type-id="text-editor">
  1015 + <state vertical-scroll-proportion="-10.259259" vertical-offset="728" max-vertical-offset="1410">
  1016 + <caret line="67" column="10" selection-start-line="67" selection-start-column="10" selection-end-line="67" selection-end-column="10" />
1096 1017 <folding />
1097 1018 </state>
1098 1019 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.48)
  4 + kanjai (0.0.49)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -65,7 +65,7 @@ module Kanjai
65 65 if data
66 66 data[attributes]
67 67 else
68   - nil
  68 + ''
69 69 end
70 70 end
71 71
... ...
1 1 module Kanjai
2   - VERSION = "0.0.49"
  2 + VERSION = "0.0.50"
3 3 end
... ...