EDIT / kanjai · Commits

Commit 26f11ead963fe15ad9973a4acdf9ab63d3345f79

Authored by Karpikau Andrei
1 parent 9aa447ef

test

Inline Side-by-side
Showing 6 changed files with 19 additions and 19 deletions
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 28 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
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="315"> 30 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
31 - <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" /> 31 + <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
32 <folding /> 32 <folding />
33 </state> 33 </state>
34 </provider> 34 </provider>
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb"> 38 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
39 <provider selected="true" editor-type-id="text-editor"> 39 <provider selected="true" editor-type-id="text-editor">
40 <state vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="390"> 40 <state vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="390">
41 - <caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" /> 41 + <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />
42 <folding /> 42 <folding />
43 </state> 43 </state>
44 </provider> 44 </provider>
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 68 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
69 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
70 <state vertical-scroll-proportion="-21.041666" vertical-offset="95" max-vertical-offset="810"> 70 <state vertical-scroll-proportion="-21.041666" vertical-offset="95" max-vertical-offset="810">
71 - <caret line="40" column="28" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" /> 71 + <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" />
72 <folding /> 72 <folding />
73 </state> 73 </state>
74 </provider> 74 </provider>
@@ -156,9 +156,9 @@ @@ -156,9 +156,9 @@
156 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" /> 156 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
157 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" /> 157 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
158 <option value="$PROJECT_DIR$/config/initializers/assets.rb" /> 158 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
159 - <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />  
160 - <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />  
161 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" /> 159 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
  160 + <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
  161 + <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
162 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 162 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
163 </list> 163 </list>
164 </option> 164 </option>
@@ -1001,26 +1001,26 @@ @@ -1001,26 +1001,26 @@
1001 </state> 1001 </state>
1002 </provider> 1002 </provider>
1003 </entry> 1003 </entry>
1004 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 1004 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
1005 <provider selected="true" editor-type-id="text-editor"> 1005 <provider selected="true" editor-type-id="text-editor">
1006 - <state vertical-scroll-proportion="-21.041666" vertical-offset="95" max-vertical-offset="810">  
1007 - <caret line="40" column="28" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" /> 1006 + <state vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="390">
  1007 + <caret line="4" column="37" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="37" />
1008 <folding /> 1008 <folding />
1009 </state> 1009 </state>
1010 </provider> 1010 </provider>
1011 </entry> 1011 </entry>
1012 - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 1012 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
1013 <provider selected="true" editor-type-id="text-editor"> 1013 <provider selected="true" editor-type-id="text-editor">
1014 - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">  
1015 - <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" /> 1014 + <state vertical-scroll-proportion="-21.041666" vertical-offset="95" max-vertical-offset="810">
  1015 + <caret line="40" column="35" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="35" />
1016 <folding /> 1016 <folding />
1017 </state> 1017 </state>
1018 </provider> 1018 </provider>
1019 </entry> 1019 </entry>
1020 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb"> 1020 + <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
1021 <provider selected="true" editor-type-id="text-editor"> 1021 <provider selected="true" editor-type-id="text-editor">
1022 - <state vertical-scroll-proportion="-2.5" vertical-offset="0" max-vertical-offset="390">  
1023 - <caret line="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" /> 1022 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  1023 + <caret line="15" column="0" selection-start-line="15" selection-start-column="0" selection-end-line="15" selection-end-column="0" />
1024 <folding /> 1024 <folding />
1025 </state> 1025 </state>
1026 </provider> 1026 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.9) 4 + kanjai (0.0.10)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 <%= yield %> 38 <%= yield %>
39 39
40 40
41 -<%= stylesheet_link_tag "general" %> 41 +<%= stylesheet_link_tag "kanjai/general" %>
42 <%= stylesheet_link_tag "kanjai/general_admin" %> 42 <%= stylesheet_link_tag "kanjai/general_admin" %>
43 43
44 <%= javascript_include_tag "kanjai/general_admin" %> 44 <%= javascript_include_tag "kanjai/general_admin" %>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <title><%= t('login_title') %></title> 4 <title><%= t('login_title') %></title>
5 - <%= stylesheet_link_tag "general" %> 5 + <%= stylesheet_link_tag "kanjai/general" %>
6 <%= stylesheet_link_tag "kanjai/general_admin" %> 6 <%= stylesheet_link_tag "kanjai/general_admin" %>
7 7
8 <%= javascript_include_tag "kanjai/general_admin" %> 8 <%= javascript_include_tag "kanjai/general_admin" %>
@@ -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(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)
12 end 12 end
13 13
14 end 14 end
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.10" 2 + VERSION = "0.0.11"
3 end 3 end