EDIT / kanjai · Commits

Commit 02ecf78d424cf0ca8ca135ad095f1230269fee5c

Authored by Karpikau Andrei
1 parent 8be3ca23

check register form

Inline Side-by-side
Showing 6 changed files with 115 additions and 153 deletions
... ... @@ -24,101 +24,101 @@
24 24 </component>
25 25 <component name="FileEditorManager">
26 26 <leaf>
27   - <file leaf-file-name="admin.rb" pinned="false" current-in-tab="false">
28   - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  27 + <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
  28 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
29 29 <provider selected="true" editor-type-id="text-editor">
30   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
31   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  30 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  31 + <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
32 32 <folding />
33 33 </state>
34 34 </provider>
35 35 </entry>
36 36 </file>
37   - <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
38   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  37 + <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
39 39 <provider selected="true" editor-type-id="text-editor">
40   - <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
41   - <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
  40 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
  41 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="24" />
42 42 <folding />
43 43 </state>
44 44 </provider>
45 45 </entry>
46 46 </file>
47   - <file leaf-file-name="install.rake" pinned="false" current-in-tab="false">
48   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  47 + <file leaf-file-name="frontend_not_login.js" pinned="false" current-in-tab="false">
  48 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
49 49 <provider selected="true" editor-type-id="text-editor">
50   - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="390">
51   - <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
  50 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  51 + <caret line="0" column="24" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
52 52 <folding />
53 53 </state>
54 54 </provider>
55 55 </entry>
56 56 </file>
57   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
58   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  57 + <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">
  58 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
59 59 <provider selected="true" editor-type-id="text-editor">
60   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
61   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
  60 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  61 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
62 62 <folding />
63 63 </state>
64 64 </provider>
65 65 </entry>
66 66 </file>
67   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
68   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  67 + <file leaf-file-name="engine.rb" pinned="false" current-in-tab="false">
  68 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
69 69 <provider selected="true" editor-type-id="text-editor">
70   - <state vertical-scroll-proportion="0.0" vertical-offset="1710" max-vertical-offset="2115">
71   - <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" />
  70 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  71 + <caret line="10" column="275" selection-start-line="10" selection-start-column="275" selection-end-line="10" selection-end-column="275" />
72 72 <folding />
73 73 </state>
74 74 </provider>
75 75 </entry>
76 76 </file>
77   - <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
78   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  77 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  78 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
79 79 <provider selected="true" editor-type-id="text-editor">
80   - <state vertical-scroll-proportion="0.0" vertical-offset="551" max-vertical-offset="1185">
81   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  80 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  81 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
82 82 <folding />
83 83 </state>
84 84 </provider>
85 85 </entry>
86 86 </file>
87   - <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">
88   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  87 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  88 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
89 89 <provider selected="true" editor-type-id="text-editor">
90   - <state vertical-scroll-proportion="0.0" vertical-offset="1811" max-vertical-offset="2445">
91   - <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
  90 + <state vertical-scroll-proportion="0.0" vertical-offset="1466" max-vertical-offset="2145">
  91 + <caret line="117" column="0" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" />
92 92 <folding />
93 93 </state>
94 94 </provider>
95 95 </entry>
96 96 </file>
97   - <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
98   - <entry file="file://$PROJECT_DIR$/Gemfile">
  97 + <file leaf-file-name="aws.rb" pinned="false" current-in-tab="false">
  98 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
99 99 <provider selected="true" editor-type-id="text-editor">
100   - <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="255">
101   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  100 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  101 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
102 102 <folding />
103 103 </state>
104 104 </provider>
105 105 </entry>
106 106 </file>
107   - <file leaf-file-name="kanjai.rb" pinned="false" current-in-tab="false">
108   - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
  107 + <file leaf-file-name="README.rdoc" pinned="false" current-in-tab="false">
  108 + <entry file="file://$PROJECT_DIR$/README.rdoc">
109 109 <provider selected="true" editor-type-id="text-editor">
110   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
111   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  110 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="120">
  111 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
112 112 <folding />
113 113 </state>
114 114 </provider>
115 115 </entry>
116 116 </file>
117   - <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
118   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  117 + <file leaf-file-name="page_content.rb" pinned="false" current-in-tab="false">
  118 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
119 119 <provider selected="true" editor-type-id="text-editor">
120   - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
121   - <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
  120 + <state vertical-scroll-proportion="0.0" vertical-offset="1811" max-vertical-offset="2445">
  121 + <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
122 122 <folding />
123 123 </state>
124 124 </provider>
... ... @@ -129,7 +129,6 @@
129 129 <component name="IdeDocumentHistory">
130 130 <option name="CHANGED_PATHS">
131 131 <list>
132   - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss" />
133 132 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
134 133 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site.css.scss" />
135 134 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site_editor.css.scss" />
... ... @@ -170,15 +169,16 @@
170 169 <option value="$PROJECT_DIR$/kanjai.gemspec" />
171 170 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
172 171 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
173   - <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
174 172 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
175 173 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
176 174 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
177 175 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
178   - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
179 176 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
180 177 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
181 178 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
  179 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" />
  180 + <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
  181 + <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
182 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 183 </list>
184 184 </option>
... ... @@ -215,6 +215,7 @@
215 215 </navigator>
216 216 <panes>
217 217 <pane id="RailsProjectView" />
  218 + <pane id="Scope" />
218 219 <pane id="ProjectPane">
219 220 <subPane>
220 221 <PATH>
... ... @@ -307,24 +308,6 @@
307 308 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
308 309 </PATH_ELEMENT>
309 310 <PATH_ELEMENT>
310   - <option name="myItemId" value="config" />
311   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
312   - </PATH_ELEMENT>
313   - <PATH_ELEMENT>
314   - <option name="myItemId" value="initializers" />
315   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
316   - </PATH_ELEMENT>
317   - </PATH>
318   - <PATH>
319   - <PATH_ELEMENT>
320   - <option name="myItemId" value="kanjai" />
321   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
322   - </PATH_ELEMENT>
323   - <PATH_ELEMENT>
324   - <option name="myItemId" value="kanjai" />
325   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
326   - </PATH_ELEMENT>
327   - <PATH_ELEMENT>
328 311 <option name="myItemId" value="app" />
329 312 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
330 313 </PATH_ELEMENT>
... ... @@ -346,28 +329,6 @@
346 329 <option name="myItemId" value="app" />
347 330 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
348 331 </PATH_ELEMENT>
349   - <PATH_ELEMENT>
350   - <option name="myItemId" value="models" />
351   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
352   - </PATH_ELEMENT>
353   - <PATH_ELEMENT>
354   - <option name="myItemId" value="kanjai" />
355   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
356   - </PATH_ELEMENT>
357   - </PATH>
358   - <PATH>
359   - <PATH_ELEMENT>
360   - <option name="myItemId" value="kanjai" />
361   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
362   - </PATH_ELEMENT>
363   - <PATH_ELEMENT>
364   - <option name="myItemId" value="kanjai" />
365   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
366   - </PATH_ELEMENT>
367   - <PATH_ELEMENT>
368   - <option name="myItemId" value="app" />
369   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
370   - </PATH_ELEMENT>
371 332 </PATH>
372 333 <PATH>
373 334 <PATH_ELEMENT>
... ... @@ -411,7 +372,6 @@
411 372 </PATH>
412 373 </subPane>
413 374 </pane>
414   - <pane id="Scope" />
415 375 </panes>
416 376 </component>
417 377 <component name="PropertiesComponent">
... ... @@ -599,7 +559,9 @@
599 559 <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" />
600 560 <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" />
601 561 <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" />
602   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2657512" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  562 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27382874" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  563 + <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" />
  564 + <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" />
603 565 <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" />
604 566 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
605 567 <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" />
... ... @@ -607,12 +569,10 @@
607 569 <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" />
608 570 <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" />
609 571 <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" />
610   - <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" />
611 572 <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" />
612 573 <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" />
613 574 <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" />
614 575 <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" />
615   - <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" />
616 576 </layout>
617 577 </component>
618 578 <component name="Vcs.Log.UiProperties">
... ... @@ -636,21 +596,6 @@
636 596 <watches-manager />
637 597 </component>
638 598 <component name="editorHistoryManager">
639   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/underscore.js">
640   - <provider selected="true" editor-type-id="text-editor">
641   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
642   - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
643   - </state>
644   - </provider>
645   - </entry>
646   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
647   - <provider selected="true" editor-type-id="text-editor">
648   - <state vertical-scroll-proportion="-54.22222" vertical-offset="1041" max-vertical-offset="4230">
649   - <caret line="167" column="0" selection-start-line="167" selection-start-column="0" selection-end-line="167" selection-end-column="0" />
650   - <folding />
651   - </state>
652   - </provider>
653   - </entry>
654 599 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
655 600 <provider selected="true" editor-type-id="text-editor">
656 601 <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615">
... ... @@ -749,14 +694,6 @@
749 694 </state>
750 695 </provider>
751 696 </entry>
752   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
753   - <provider selected="true" editor-type-id="text-editor">
754   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
755   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
756   - <folding />
757   - </state>
758   - </provider>
759   - </entry>
760 697 <entry file="file://$PROJECT_DIR$/lib/stdrubyext.rb">
761 698 <provider selected="true" editor-type-id="text-editor">
762 699 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">
... ... @@ -782,7 +719,6 @@
782 719 <provider selected="true" editor-type-id="text-editor">
783 720 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
784 721 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
785   - <folding />
786 722 </state>
787 723 </provider>
788 724 </entry>
... ... @@ -856,13 +792,6 @@
856 792 </state>
857 793 </provider>
858 794 </entry>
859   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
860   - <provider selected="true" editor-type-id="text-editor">
861   - <state vertical-scroll-proportion="0.0" vertical-offset="109" max-vertical-offset="540">
862   - <caret line="27" column="28" selection-start-line="27" selection-start-column="28" selection-end-line="27" selection-end-column="28" />
863   - </state>
864   - </provider>
865   - </entry>
866 795 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
867 796 <provider selected="true" editor-type-id="text-editor">
868 797 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
... ... @@ -912,90 +841,120 @@
912 841 </state>
913 842 </provider>
914 843 </entry>
915   - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  844 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
916 845 <provider selected="true" editor-type-id="text-editor">
917   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
918   - <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
919   - <folding />
  846 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
  847 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
920 848 </state>
921 849 </provider>
922 850 </entry>
923   - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
  851 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
924 852 <provider selected="true" editor-type-id="text-editor">
925   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  853 + <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
  854 + <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
  855 + </state>
  856 + </provider>
  857 + </entry>
  858 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  859 + <provider selected="true" editor-type-id="text-editor">
  860 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1185">
926 861 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
927 862 <folding />
928 863 </state>
929 864 </provider>
930 865 </entry>
931   - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  866 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
932 867 <provider selected="true" editor-type-id="text-editor">
933   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
934   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  868 + <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
  869 + <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
935 870 <folding />
936 871 </state>
937 872 </provider>
938 873 </entry>
939   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  874 + <entry file="file://$PROJECT_DIR$/Gemfile">
940 875 <provider selected="true" editor-type-id="text-editor">
941   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
942   - <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
  876 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  877 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
943 878 <folding />
944 879 </state>
945 880 </provider>
946 881 </entry>
947   - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
  882 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
948 883 <provider selected="true" editor-type-id="text-editor">
949   - <state vertical-scroll-proportion="0.0" vertical-offset="2858" max-vertical-offset="4110">
950   - <caret line="207" column="28" selection-start-line="207" selection-start-column="28" selection-end-line="207" selection-end-column="28" />
  884 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  885 + <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
951 886 <folding />
952 887 </state>
953 888 </provider>
954 889 </entry>
955   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  890 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
956 891 <provider selected="true" editor-type-id="text-editor">
957   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1185">
  892 + <state vertical-scroll-proportion="0.0" vertical-offset="1811" max-vertical-offset="2445">
  893 + <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
  894 + <folding />
  895 + </state>
  896 + </provider>
  897 + </entry>
  898 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  899 + <provider selected="true" editor-type-id="text-editor">
  900 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="416">
958 901 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
959 902 <folding />
960 903 </state>
961 904 </provider>
962 905 </entry>
963   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  906 + <entry file="file://$PROJECT_DIR$/README.rdoc">
964 907 <provider selected="true" editor-type-id="text-editor">
965   - <state vertical-scroll-proportion="0.0" vertical-offset="465" max-vertical-offset="1140">
966   - <caret line="58" column="41" selection-start-line="58" selection-start-column="20" selection-end-line="58" selection-end-column="41" />
  908 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  909 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
967 910 <folding />
968 911 </state>
969 912 </provider>
970 913 </entry>
971   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  914 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
972 915 <provider selected="true" editor-type-id="text-editor">
973   - <state vertical-scroll-proportion="0.0" vertical-offset="1481" max-vertical-offset="2115">
974   - <caret line="114" column="63" selection-start-line="114" selection-start-column="52" selection-end-line="114" selection-end-column="63" />
  916 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  917 + <caret line="6" column="40" selection-start-line="6" selection-start-column="25" selection-end-line="6" selection-end-column="40" />
975 918 <folding />
976 919 </state>
977 920 </provider>
978 921 </entry>
979   - <entry file="file://$PROJECT_DIR$/Gemfile">
  922 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
980 923 <provider selected="true" editor-type-id="text-editor">
981   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
982   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  924 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="540">
  925 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="24" />
983 926 <folding />
984 927 </state>
985 928 </provider>
986 929 </entry>
987   - <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
  930 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js">
988 931 <provider selected="true" editor-type-id="text-editor">
989   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
990   - <caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
  932 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  933 + <caret line="0" column="24" selection-start-line="0" selection-start-column="24" selection-end-line="0" selection-end-column="24" />
991 934 <folding />
992 935 </state>
993 936 </provider>
994 937 </entry>
995   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  938 + <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
996 939 <provider selected="true" editor-type-id="text-editor">
997   - <state vertical-scroll-proportion="0.0" vertical-offset="1811" max-vertical-offset="2445">
998   - <caret line="130" column="0" selection-start-line="130" selection-start-column="0" selection-end-line="130" selection-end-column="0" />
  940 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  941 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  942 + <folding />
  943 + </state>
  944 + </provider>
  945 + </entry>
  946 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  947 + <provider selected="true" editor-type-id="text-editor">
  948 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  949 + <caret line="10" column="275" selection-start-line="10" selection-start-column="275" selection-end-line="10" selection-end-column="275" />
  950 + <folding />
  951 + </state>
  952 + </provider>
  953 + </entry>
  954 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  955 + <provider selected="true" editor-type-id="text-editor">
  956 + <state vertical-scroll-proportion="0.0" vertical-offset="1466" max-vertical-offset="2145">
  957 + <caret line="117" column="0" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" />
999 958 <folding />
1000 959 </state>
1001 960 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.13)
  4 + kanjai (0.0.14)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
  1 +//= require kanjai/rails
\ No newline at end of file
... ...
... ... @@ -114,6 +114,8 @@ module Kanjai
114 114 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>"
115 115 css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.css')}"
116 116 js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>"
  117 + else
  118 + js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_not_login.js')}'></script>"
117 119 end
118 120 layer.gsub!(marker, js_array.join(''))
119 121 else
... ...
... ... @@ -8,7 +8,7 @@ module Kanjai
8 8 config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
9 9
10 10 initializer "kanjai.assets.precompile" do |app|
11   - app.config.assets.precompile = %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js)
  11 + app.config.assets.precompile = %w(kanjai/general.css kanjai/general_admin.css kanjai/general_site.css kanjai/general_site_editor.css kanjai/frontend.css kanjai/general.js kanjai/general_admin.js kanjai/general_site_editor.js kanjai/frontend.js kanjai/frontend_not_login.js)
12 12 end
13 13
14 14 end
... ...
1 1 module Kanjai
2   - VERSION = "0.0.14"
  2 + VERSION = "0.0.15"
3 3 end
... ...