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,101 +24,101 @@
24 </component> 24 </component>
25 <component name="FileEditorManager"> 25 <component name="FileEditorManager">
26 <leaf> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
35 </entry> 35 </entry>
36 </file> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 42 <folding />
43 </state> 43 </state>
44 </provider> 44 </provider>
45 </entry> 45 </entry>
46 </file> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 52 <folding />
53 </state> 53 </state>
54 </provider> 54 </provider>
55 </entry> 55 </entry>
56 </file> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 62 <folding />
63 </state> 63 </state>
64 </provider> 64 </provider>
65 </entry> 65 </entry>
66 </file> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 72 <folding />
73 </state> 73 </state>
74 </provider> 74 </provider>
75 </entry> 75 </entry>
76 </file> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 82 <folding />
83 </state> 83 </state>
84 </provider> 84 </provider>
85 </entry> 85 </entry>
86 </file> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 92 <folding />
93 </state> 93 </state>
94 </provider> 94 </provider>
95 </entry> 95 </entry>
96 </file> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 102 <folding />
103 </state> 103 </state>
104 </provider> 104 </provider>
105 </entry> 105 </entry>
106 </file> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 112 <folding />
113 </state> 113 </state>
114 </provider> 114 </provider>
115 </entry> 115 </entry>
116 </file> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 122 <folding />
123 </state> 123 </state>
124 </provider> 124 </provider>
@@ -129,7 +129,6 @@ @@ -129,7 +129,6 @@
129 <component name="IdeDocumentHistory"> 129 <component name="IdeDocumentHistory">
130 <option name="CHANGED_PATHS"> 130 <option name="CHANGED_PATHS">
131 <list> 131 <list>
132 - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss" />  
133 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" /> 132 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
134 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site.css.scss" /> 133 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site.css.scss" />
135 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site_editor.css.scss" /> 134 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_site_editor.css.scss" />
@@ -170,15 +169,16 @@ @@ -170,15 +169,16 @@
170 <option value="$PROJECT_DIR$/kanjai.gemspec" /> 169 <option value="$PROJECT_DIR$/kanjai.gemspec" />
171 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" /> 170 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
172 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" /> 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 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" /> 172 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
175 <option value="$PROJECT_DIR$/config/initializers/assets.rb" /> 173 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
176 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" /> 174 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
177 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" /> 175 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
178 - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />  
179 <option value="$PROJECT_DIR$/config/initializers/devise.rb" /> 176 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
180 <option value="$PROJECT_DIR$/lib/kanjai.rb" /> 177 <option value="$PROJECT_DIR$/lib/kanjai.rb" />
181 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" /> 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 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 182 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
183 </list> 183 </list>
184 </option> 184 </option>
@@ -215,6 +215,7 @@ @@ -215,6 +215,7 @@
215 </navigator> 215 </navigator>
216 <panes> 216 <panes>
217 <pane id="RailsProjectView" /> 217 <pane id="RailsProjectView" />
  218 + <pane id="Scope" />
218 <pane id="ProjectPane"> 219 <pane id="ProjectPane">
219 <subPane> 220 <subPane>
220 <PATH> 221 <PATH>
@@ -307,24 +308,6 @@ @@ -307,24 +308,6 @@
307 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 308 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
308 </PATH_ELEMENT> 309 </PATH_ELEMENT>
309 <PATH_ELEMENT> 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 <option name="myItemId" value="app" /> 311 <option name="myItemId" value="app" />
329 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 312 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
330 </PATH_ELEMENT> 313 </PATH_ELEMENT>
@@ -346,28 +329,6 @@ @@ -346,28 +329,6 @@
346 <option name="myItemId" value="app" /> 329 <option name="myItemId" value="app" />
347 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> 330 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
348 </PATH_ELEMENT> 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 </PATH> 332 </PATH>
372 <PATH> 333 <PATH>
373 <PATH_ELEMENT> 334 <PATH_ELEMENT>
@@ -411,7 +372,6 @@ @@ -411,7 +372,6 @@
411 </PATH> 372 </PATH>
412 </subPane> 373 </subPane>
413 </pane> 374 </pane>
414 - <pane id="Scope" />  
415 </panes> 375 </panes>
416 </component> 376 </component>
417 <component name="PropertiesComponent"> 377 <component name="PropertiesComponent">
@@ -599,7 +559,9 @@ @@ -599,7 +559,9 @@
599 <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" /> 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 <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" /> 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 <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" /> 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 <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" /> 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 <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" /> 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 <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" /> 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,12 +569,10 @@
607 <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" /> 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 <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" /> 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 <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" /> 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 <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" /> 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 <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" /> 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 <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" /> 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 <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" /> 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 </layout> 576 </layout>
617 </component> 577 </component>
618 <component name="Vcs.Log.UiProperties"> 578 <component name="Vcs.Log.UiProperties">
@@ -636,21 +596,6 @@ @@ -636,21 +596,6 @@
636 <watches-manager /> 596 <watches-manager />
637 </component> 597 </component>
638 <component name="editorHistoryManager"> 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 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb"> 599 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
655 <provider selected="true" editor-type-id="text-editor"> 600 <provider selected="true" editor-type-id="text-editor">
656 <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615"> 601 <state vertical-scroll-proportion="-3.75" vertical-offset="0" max-vertical-offset="615">
@@ -749,14 +694,6 @@ @@ -749,14 +694,6 @@
749 </state> 694 </state>
750 </provider> 695 </provider>
751 </entry> 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 <entry file="file://$PROJECT_DIR$/lib/stdrubyext.rb"> 697 <entry file="file://$PROJECT_DIR$/lib/stdrubyext.rb">
761 <provider selected="true" editor-type-id="text-editor"> 698 <provider selected="true" editor-type-id="text-editor">
762 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750"> 699 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">
@@ -782,7 +719,6 @@ @@ -782,7 +719,6 @@
782 <provider selected="true" editor-type-id="text-editor"> 719 <provider selected="true" editor-type-id="text-editor">
783 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634"> 720 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
784 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 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 </state> 722 </state>
787 </provider> 723 </provider>
788 </entry> 724 </entry>
@@ -856,13 +792,6 @@ @@ -856,13 +792,6 @@
856 </state> 792 </state>
857 </provider> 793 </provider>
858 </entry> 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 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js"> 795 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
867 <provider selected="true" editor-type-id="text-editor"> 796 <provider selected="true" editor-type-id="text-editor">
868 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615"> 797 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
@@ -912,90 +841,120 @@ @@ -912,90 +841,120 @@
912 </state> 841 </state>
913 </provider> 842 </provider>
914 </entry> 843 </entry>
915 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 844 + <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
916 <provider selected="true" editor-type-id="text-editor"> 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 </state> 848 </state>
921 </provider> 849 </provider>
922 </entry> 850 </entry>
923 - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb"> 851 + <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
924 <provider selected="true" editor-type-id="text-editor"> 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 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 861 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
927 <folding /> 862 <folding />
928 </state> 863 </state>
929 </provider> 864 </provider>
930 </entry> 865 </entry>
931 - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb"> 866 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
932 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 870 <folding />
936 </state> 871 </state>
937 </provider> 872 </provider>
938 </entry> 873 </entry>
939 - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake"> 874 + <entry file="file://$PROJECT_DIR$/Gemfile">
940 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 878 <folding />
944 </state> 879 </state>
945 </provider> 880 </provider>
946 </entry> 881 </entry>
947 - <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb"> 882 + <entry file="file://$PROJECT_DIR$/lib/kanjai.rb">
948 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 886 <folding />
952 </state> 887 </state>
953 </provider> 888 </provider>
954 </entry> 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 <provider selected="true" editor-type-id="text-editor"> 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 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> 901 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
959 <folding /> 902 <folding />
960 </state> 903 </state>
961 </provider> 904 </provider>
962 </entry> 905 </entry>
963 - <entry file="file://$PROJECT_DIR$/kanjai.gemspec"> 906 + <entry file="file://$PROJECT_DIR$/README.rdoc">
964 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 910 <folding />
968 </state> 911 </state>
969 </provider> 912 </provider>
970 </entry> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 918 <folding />
976 </state> 919 </state>
977 </provider> 920 </provider>
978 </entry> 921 </entry>
979 - <entry file="file://$PROJECT_DIR$/Gemfile"> 922 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
980 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 926 <folding />
984 </state> 927 </state>
985 </provider> 928 </provider>
986 </entry> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 934 <folding />
992 </state> 935 </state>
993 </provider> 936 </provider>
994 </entry> 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 <provider selected="true" editor-type-id="text-editor"> 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 <folding /> 958 <folding />
1000 </state> 959 </state>
1001 </provider> 960 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.13) 4 + kanjai (0.0.14)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -114,6 +114,8 @@ module Kanjai @@ -114,6 +114,8 @@ module Kanjai
114 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>" 114 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>"
115 css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.css')}" 115 css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.css')}"
116 js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>" 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 end 119 end
118 layer.gsub!(marker, js_array.join('')) 120 layer.gsub!(marker, js_array.join(''))
119 else 121 else
@@ -8,7 +8,7 @@ module Kanjai @@ -8,7 +8,7 @@ module Kanjai
8 config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts") 8 config.assets.paths << Kanjai::Engine.root.join("app", "assets", "fonts")
9 9
10 initializer "kanjai.assets.precompile" do |app| 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 end 12 end
13 13
14 end 14 end
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.14" 2 + VERSION = "0.0.15"
3 end 3 end