EDIT / kanjai · Commits

Commit a7577196c88746136d1ea3f24511ad9c0f9b38c3

Authored by Karpikau Andrei
1 parent 29fde71b

set new version kanjai

Inline Side-by-side
Showing 5 changed files with 113 additions and 195 deletions
... ... @@ -25,51 +25,51 @@
25 25 </component>
26 26 <component name="FileEditorManager">
27 27 <leaf>
28   - <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
29   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  28 + <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
32   - <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  31 + <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="990">
  32 + <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
33 33 <folding />
34 34 </state>
35 35 </provider>
36 36 </entry>
37 37 </file>
38   - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  38 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  39 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
40 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="0.0" vertical-offset="2370" max-vertical-offset="4380">
42   - <caret line="150" column="36" selection-start-line="150" selection-start-column="36" selection-end-line="150" selection-end-column="60" />
  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" />
43 43 <folding />
44 44 </state>
45 45 </provider>
46 46 </entry>
47 47 </file>
48   - <file leaf-file-name="site_controller.rb" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  48 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
50 50 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="0.0" vertical-offset="356" max-vertical-offset="990">
52   - <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
  51 + <state vertical-scroll-proportion="-13.037037" vertical-offset="38" max-vertical-offset="2505">
  52 + <caret line="26" column="94" selection-start-line="26" selection-start-column="80" selection-end-line="26" selection-end-column="94" />
53 53 <folding />
54 54 </state>
55 55 </provider>
56 56 </entry>
57 57 </file>
58   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  58 + <file leaf-file-name="page_datum.rb" pinned="false" current-in-tab="false">
  59 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
60 60 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="-7.4814816" vertical-offset="173" max-vertical-offset="2490">
62   - <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
  61 + <state vertical-scroll-proportion="0.0" vertical-offset="11" max-vertical-offset="735">
  62 + <caret line="39" column="15" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
63 63 <folding />
64 64 </state>
65 65 </provider>
66 66 </entry>
67 67 </file>
68   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
69   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  68 + <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
  69 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
70 70 <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
72   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  71 + <state vertical-scroll-proportion="0.0" vertical-offset="296" max-vertical-offset="1410">
  72 + <caret line="25" column="23" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="23" />
73 73 <folding />
74 74 </state>
75 75 </provider>
... ... @@ -78,48 +78,48 @@
78 78 <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
79 79 <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
80 80 <provider selected="true" editor-type-id="text-editor">
81   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="180">
  81 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
82 82 <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
83 83 <folding />
84 84 </state>
85 85 </provider>
86 86 </entry>
87 87 </file>
88   - <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">
89   - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  88 + <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
90 90 <provider selected="true" editor-type-id="text-editor">
91   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
92   - <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
  91 + <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
  92 + <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
93 93 <folding />
94 94 </state>
95 95 </provider>
96 96 </entry>
97 97 </file>
98   - <file leaf-file-name="kanjai_tasks.rake" pinned="false" current-in-tab="false">
99   - <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
  98 + <file leaf-file-name="application_controller.rb" pinned="false" current-in-tab="false">
  99 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
100 100 <provider selected="true" editor-type-id="text-editor">
101   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="150">
102   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  101 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  102 + <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
103 103 <folding />
104 104 </state>
105 105 </provider>
106 106 </entry>
107 107 </file>
108   - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
109   - <entry file="file://$PROJECT_DIR$/Gemfile">
  108 + <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">
  109 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
110 110 <provider selected="true" editor-type-id="text-editor">
111   - <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="255">
112   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  111 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  112 + <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
113 113 <folding />
114 114 </state>
115 115 </provider>
116 116 </entry>
117 117 </file>
118   - <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
119   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  118 + <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
120 120 <provider selected="true" editor-type-id="text-editor">
121   - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
122   - <caret line="47" column="21" selection-start-line="47" selection-start-column="21" selection-end-line="47" selection-end-column="21" />
  121 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  122 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
123 123 <folding />
124 124 </state>
125 125 </provider>
... ... @@ -130,7 +130,6 @@
130 130 <component name="IdeDocumentHistory">
131 131 <option name="CHANGED_PATHS">
132 132 <list>
133   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb" />
134 133 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb" />
135 134 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/index.html.erb" />
136 135 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/meta.html.erb" />
... ... @@ -180,6 +179,7 @@
180 179 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
181 180 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
182 181 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  182 + <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
183 183 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
184 184 </list>
185 185 </option>
... ... @@ -330,88 +330,6 @@
330 330 <option name="myItemId" value="app" />
331 331 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
332 332 </PATH_ELEMENT>
333   - <PATH_ELEMENT>
334   - <option name="myItemId" value="views" />
335   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
336   - </PATH_ELEMENT>
337   - </PATH>
338   - <PATH>
339   - <PATH_ELEMENT>
340   - <option name="myItemId" value="kanjai" />
341   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
342   - </PATH_ELEMENT>
343   - <PATH_ELEMENT>
344   - <option name="myItemId" value="kanjai" />
345   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
346   - </PATH_ELEMENT>
347   - <PATH_ELEMENT>
348   - <option name="myItemId" value="app" />
349   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
350   - </PATH_ELEMENT>
351   - <PATH_ELEMENT>
352   - <option name="myItemId" value="views" />
353   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
354   - </PATH_ELEMENT>
355   - <PATH_ELEMENT>
356   - <option name="myItemId" value="kanjai" />
357   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
358   - </PATH_ELEMENT>
359   - </PATH>
360   - <PATH>
361   - <PATH_ELEMENT>
362   - <option name="myItemId" value="kanjai" />
363   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
364   - </PATH_ELEMENT>
365   - <PATH_ELEMENT>
366   - <option name="myItemId" value="kanjai" />
367   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
368   - </PATH_ELEMENT>
369   - <PATH_ELEMENT>
370   - <option name="myItemId" value="app" />
371   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
372   - </PATH_ELEMENT>
373   - <PATH_ELEMENT>
374   - <option name="myItemId" value="views" />
375   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
376   - </PATH_ELEMENT>
377   - <PATH_ELEMENT>
378   - <option name="myItemId" value="kanjai" />
379   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
380   - </PATH_ELEMENT>
381   - <PATH_ELEMENT>
382   - <option name="myItemId" value="admin" />
383   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
384   - </PATH_ELEMENT>
385   - </PATH>
386   - <PATH>
387   - <PATH_ELEMENT>
388   - <option name="myItemId" value="kanjai" />
389   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
390   - </PATH_ELEMENT>
391   - <PATH_ELEMENT>
392   - <option name="myItemId" value="kanjai" />
393   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
394   - </PATH_ELEMENT>
395   - <PATH_ELEMENT>
396   - <option name="myItemId" value="app" />
397   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
398   - </PATH_ELEMENT>
399   - <PATH_ELEMENT>
400   - <option name="myItemId" value="views" />
401   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
402   - </PATH_ELEMENT>
403   - <PATH_ELEMENT>
404   - <option name="myItemId" value="kanjai" />
405   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
406   - </PATH_ELEMENT>
407   - <PATH_ELEMENT>
408   - <option name="myItemId" value="admin" />
409   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
410   - </PATH_ELEMENT>
411   - <PATH_ELEMENT>
412   - <option name="myItemId" value="page_langs" />
413   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
414   - </PATH_ELEMENT>
415 333 </PATH>
416 334 <PATH>
417 335 <PATH_ELEMENT>
... ... @@ -448,20 +366,6 @@
448 366 <option name="myItemId" value="app" />
449 367 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
450 368 </PATH_ELEMENT>
451   - </PATH>
452   - <PATH>
453   - <PATH_ELEMENT>
454   - <option name="myItemId" value="kanjai" />
455   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
456   - </PATH_ELEMENT>
457   - <PATH_ELEMENT>
458   - <option name="myItemId" value="kanjai" />
459   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
460   - </PATH_ELEMENT>
461   - <PATH_ELEMENT>
462   - <option name="myItemId" value="app" />
463   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
464   - </PATH_ELEMENT>
465 369 <PATH_ELEMENT>
466 370 <option name="myItemId" value="helpers" />
467 371 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
... ... @@ -763,20 +667,6 @@
763 667 <watches-manager />
764 668 </component>
765 669 <component name="editorHistoryManager">
766   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
767   - <provider selected="true" editor-type-id="text-editor">
768   - <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">
769   - <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" />
770   - </state>
771   - </provider>
772   - </entry>
773   - <entry file="file://$PROJECT_DIR$/.ruby-version">
774   - <provider selected="true" editor-type-id="text-editor">
775   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
776   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
777   - </state>
778   - </provider>
779   - </entry>
780 670 <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
781 671 <provider selected="true" editor-type-id="text-editor">
782 672 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
... ... @@ -791,13 +681,6 @@
791 681 </state>
792 682 </provider>
793 683 </entry>
794   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
795   - <provider selected="true" editor-type-id="text-editor">
796   - <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
797   - <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
798   - </state>
799   - </provider>
800   - </entry>
801 684 <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
802 685 <provider selected="true" editor-type-id="text-editor">
803 686 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
... ... @@ -861,13 +744,6 @@
861 744 </state>
862 745 </provider>
863 746 </entry>
864   - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
865   - <provider selected="true" editor-type-id="text-editor">
866   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
867   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
868   - </state>
869   - </provider>
870   - </entry>
871 747 <entry file="file://$PROJECT_DIR$/app/views/shared/_extend_admin_menu.html.erb">
872 748 <provider selected="true" editor-type-id="text-editor">
873 749 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -910,13 +786,6 @@
910 786 </state>
911 787 </provider>
912 788 </entry>
913   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
914   - <provider selected="true" editor-type-id="text-editor">
915   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
916   - <caret line="1" column="29" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="29" />
917   - </state>
918   - </provider>
919   - </entry>
920 789 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/_new_form.html.erb">
921 790 <provider selected="true" editor-type-id="text-editor">
922 791 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -1046,32 +915,56 @@
1046 915 </state>
1047 916 </provider>
1048 917 </entry>
1049   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  918 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb">
1050 919 <provider selected="true" editor-type-id="text-editor">
1051   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
1052   - <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
  920 + <state vertical-scroll-proportion="0.14754099" vertical-offset="0" max-vertical-offset="610">
  921 + <caret line="6" column="96" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="96" />
  922 + </state>
  923 + </provider>
  924 + </entry>
  925 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/_form.html.erb">
  926 + <provider selected="true" editor-type-id="text-editor">
  927 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  928 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  929 + </state>
  930 + </provider>
  931 + </entry>
  932 + <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
  933 + <provider selected="true" editor-type-id="text-editor">
  934 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  935 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1053 936 <folding />
1054 937 </state>
1055 938 </provider>
1056 939 </entry>
1057   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb">
  940 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
1058 941 <provider selected="true" editor-type-id="text-editor">
1059   - <state vertical-scroll-proportion="0.14754099" vertical-offset="0" max-vertical-offset="610">
1060   - <caret line="6" column="96" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="96" />
  942 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  943 + <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  944 + <folding />
1061 945 </state>
1062 946 </provider>
1063 947 </entry>
1064   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/_form.html.erb">
  948 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  949 + <provider selected="true" editor-type-id="text-editor">
  950 + <state vertical-scroll-proportion="0.0" vertical-offset="2370" max-vertical-offset="4380">
  951 + <caret line="150" column="36" selection-start-line="150" selection-start-column="36" selection-end-line="150" selection-end-column="60" />
  952 + <folding />
  953 + </state>
  954 + </provider>
  955 + </entry>
  956 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/admin_user.rb">
1065 957 <provider selected="true" editor-type-id="text-editor">
1066 958 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1067 959 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  960 + <folding />
1068 961 </state>
1069 962 </provider>
1070 963 </entry>
1071   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  964 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
1072 965 <provider selected="true" editor-type-id="text-editor">
1073   - <state vertical-scroll-proportion="0.12460568" vertical-offset="296" max-vertical-offset="1410">
1074   - <caret line="25" column="23" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="23" />
  966 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="990">
  967 + <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
1075 968 <folding />
1076 969 </state>
1077 970 </provider>
... ... @@ -1084,42 +977,58 @@
1084 977 </state>
1085 978 </provider>
1086 979 </entry>
1087   - <entry file="file://$PROJECT_DIR$/lib/tasks/kanjai_tasks.rake">
  980 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
1088 981 <provider selected="true" editor-type-id="text-editor">
1089   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  982 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
1090 983 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1091 984 <folding />
1092 985 </state>
1093 986 </provider>
1094 987 </entry>
1095   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  988 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
1096 989 <provider selected="true" editor-type-id="text-editor">
1097   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
1098   - <caret line="11" column="19" selection-start-line="11" selection-start-column="8" selection-end-line="11" selection-end-column="19" />
  990 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  991 + <caret line="5" column="58" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
1099 992 <folding />
1100 993 </state>
1101 994 </provider>
1102 995 </entry>
1103   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  996 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
1104 997 <provider selected="true" editor-type-id="text-editor">
1105   - <state vertical-scroll-proportion="0.0" vertical-offset="2370" max-vertical-offset="4380">
1106   - <caret line="150" column="36" selection-start-line="150" selection-start-column="36" selection-end-line="150" selection-end-column="60" />
  998 + <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
  999 + <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
1107 1000 <folding />
1108 1001 </state>
1109 1002 </provider>
1110 1003 </entry>
1111   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  1004 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
1112 1005 <provider selected="true" editor-type-id="text-editor">
1113   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="990">
1114   - <caret line="1" column="22" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="22" />
  1006 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
  1007 + <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
  1008 + <folding />
  1009 + </state>
  1010 + </provider>
  1011 + </entry>
  1012 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  1013 + <provider selected="true" editor-type-id="text-editor">
  1014 + <state vertical-scroll-proportion="0.0" vertical-offset="296" max-vertical-offset="1410">
  1015 + <caret line="25" column="23" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="23" />
  1016 + <folding />
  1017 + </state>
  1018 + </provider>
  1019 + </entry>
  1020 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
  1021 + <provider selected="true" editor-type-id="text-editor">
  1022 + <state vertical-scroll-proportion="0.0" vertical-offset="11" max-vertical-offset="735">
  1023 + <caret line="39" column="15" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
1115 1024 <folding />
1116 1025 </state>
1117 1026 </provider>
1118 1027 </entry>
1119 1028 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
1120 1029 <provider selected="true" editor-type-id="text-editor">
1121   - <state vertical-scroll-proportion="-7.4814816" vertical-offset="173" max-vertical-offset="2490">
1122   - <caret line="25" column="47" selection-start-line="25" selection-start-column="47" selection-end-line="25" selection-end-column="47" />
  1030 + <state vertical-scroll-proportion="-13.037037" vertical-offset="38" max-vertical-offset="2505">
  1031 + <caret line="26" column="94" selection-start-line="26" selection-start-column="80" selection-end-line="26" selection-end-column="94" />
1123 1032 <folding />
1124 1033 </state>
1125 1034 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.37)
  4 + kanjai (0.0.38)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -23,7 +23,8 @@ module Kanjai
23 23 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
24 24 render :text => content_for_render and return
25 25 else
26   - if stale?(@page_data, public: false)
  26 + #if stale?(@page_data, public: false)
  27 + if stale?(last_modified: @page_data.last_modified, etag: @page_data.etag_cache_key)
27 28 layer = @page_data.page.page_template.get_html_content
28 29 content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
29 30 render :text => content_for_render and return
... ...
... ... @@ -32,5 +32,13 @@ module Kanjai
32 32
33 33 end
34 34
  35 + def last_modified
  36 + updated_at.utc
  37 + end
  38 +
  39 + def etag_cache_key
  40 + cache_key
  41 + end
  42 +
35 43 end
36 44 end
\ No newline at end of file
... ...
1 1 module Kanjai
2   - VERSION = "0.0.38"
  2 + VERSION = "0.0.39"
3 3 end
... ...