EDIT / kanjai · Commits

Commit 9aa447ef9ac7aefaf0099585ac212e0f815ca6fb

Authored by Karpikau Andrei
1 parent d04211a5

test

Inline Side-by-side
Showing 4 changed files with 33 additions and 51 deletions
@@ -34,6 +34,16 @@ @@ -34,6 +34,16 @@
34 </provider> 34 </provider>
35 </entry> 35 </entry>
36 </file> 36 </file>
  37 + <file leaf-file-name="admin_login.html.erb" pinned="false" current-in-tab="false">
  38 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
  39 + <provider selected="true" editor-type-id="text-editor">
  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" />
  42 + <folding />
  43 + </state>
  44 + </provider>
  45 + </entry>
  46 + </file>
37 <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false"> 47 <file leaf-file-name="assets.rb" pinned="false" current-in-tab="false">
38 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb"> 48 <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
39 <provider selected="true" editor-type-id="text-editor"> 49 <provider selected="true" editor-type-id="text-editor">
@@ -54,34 +64,6 @@ @@ -54,34 +64,6 @@
54 </provider> 64 </provider>
55 </entry> 65 </entry>
56 </file> 66 </file>
57 - <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false">  
58 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">  
59 - <provider selected="true" editor-type-id="text-editor">  
60 - <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">  
61 - <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" />  
62 - <folding>  
63 - <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." />  
64 - <marker date="1461763907000" expanded="true" signature="4297:4315" placeholder="..." />  
65 - <marker date="1461763907000" expanded="true" signature="4329:4347" placeholder="..." />  
66 - <marker date="1461763907000" expanded="true" signature="4399:4409" placeholder="..." />  
67 - <marker date="1461763907000" expanded="true" signature="4436:4499" placeholder="..." />  
68 - </folding>  
69 - </state>  
70 - </provider>  
71 - </entry>  
72 - </file>  
73 - <file leaf-file-name="html_generator.js" pinned="false" current-in-tab="false">  
74 - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">  
75 - <provider selected="true" editor-type-id="text-editor">  
76 - <state vertical-scroll-proportion="-12.0" vertical-offset="3246" max-vertical-offset="8085">  
77 - <caret line="238" column="19" selection-start-line="236" selection-start-column="0" selection-end-line="238" selection-end-column="19" />  
78 - <folding>  
79 - <marker date="1461316414000" expanded="true" signature="503:515" placeholder="..." />  
80 - </folding>  
81 - </state>  
82 - </provider>  
83 - </entry>  
84 - </file>  
85 <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false"> 67 <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">
86 <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">
87 <provider selected="true" editor-type-id="text-editor"> 69 <provider selected="true" editor-type-id="text-editor">
@@ -96,7 +78,7 @@ @@ -96,7 +78,7 @@
96 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 78 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
97 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
98 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 80 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
99 - <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" /> 81 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
100 <folding /> 82 <folding />
101 </state> 83 </state>
102 </provider> 84 </provider>
@@ -127,7 +109,6 @@ @@ -127,7 +109,6 @@
127 <component name="IdeDocumentHistory"> 109 <component name="IdeDocumentHistory">
128 <option name="CHANGED_PATHS"> 110 <option name="CHANGED_PATHS">
129 <list> 111 <list>
130 - <option value="$PROJECT_DIR$/app/views/devise/sessions/new.html.erb" />  
131 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js" /> 112 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js" />
132 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss" /> 113 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general.css.scss" />
133 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" /> 114 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
@@ -177,6 +158,7 @@ @@ -177,6 +158,7 @@
177 <option value="$PROJECT_DIR$/config/initializers/assets.rb" /> 158 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
178 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" /> 159 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
179 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" /> 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" />
180 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" /> 162 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
181 </list> 163 </list>
182 </option> 164 </option>
@@ -616,14 +598,6 @@ @@ -616,14 +598,6 @@
616 <watches-manager /> 598 <watches-manager />
617 </component> 599 </component>
618 <component name="editorHistoryManager"> 600 <component name="editorHistoryManager">
619 - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/meta.html.erb">  
620 - <provider selected="true" editor-type-id="text-editor">  
621 - <state vertical-scroll-proportion="-19.375" vertical-offset="45" max-vertical-offset="780">  
622 - <caret line="34" column="110" selection-start-line="34" selection-start-column="110" selection-end-line="34" selection-end-column="110" />  
623 - <folding />  
624 - </state>  
625 - </provider>  
626 - </entry>  
627 <entry file="file://$PROJECT_DIR$/app/assets/fonts/font-awesome-4.4.0/FontAwesome.otf"> 601 <entry file="file://$PROJECT_DIR$/app/assets/fonts/font-awesome-4.4.0/FontAwesome.otf">
628 <provider selected="true" editor-type-id="text-editor"> 602 <provider selected="true" editor-type-id="text-editor">
629 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="35325"> 603 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="35325">
@@ -968,7 +942,7 @@ @@ -968,7 +942,7 @@
968 <state vertical-scroll-proportion="-12.0" vertical-offset="3246" max-vertical-offset="8085"> 942 <state vertical-scroll-proportion="-12.0" vertical-offset="3246" max-vertical-offset="8085">
969 <caret line="238" column="19" selection-start-line="236" selection-start-column="0" selection-end-line="238" selection-end-column="19" /> 943 <caret line="238" column="19" selection-start-line="236" selection-start-column="0" selection-end-line="238" selection-end-column="19" />
970 <folding> 944 <folding>
971 - <marker date="1461316414000" expanded="true" signature="503:515" placeholder="..." /> 945 + <marker date="1461316414000" expanded="true" signature="-1:-1" placeholder="..." />
972 </folding> 946 </folding>
973 </state> 947 </state>
974 </provider> 948 </provider>
@@ -978,11 +952,11 @@ @@ -978,11 +952,11 @@
978 <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490"> 952 <state vertical-scroll-proportion="-9.962963" vertical-offset="2896" max-vertical-offset="5490">
979 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" /> 953 <caret line="211" column="51" selection-start-line="211" selection-start-column="45" selection-end-line="211" selection-end-column="51" />
980 <folding> 954 <folding>
981 - <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." />  
982 - <marker date="1461763907000" expanded="true" signature="4297:4315" placeholder="..." />  
983 - <marker date="1461763907000" expanded="true" signature="4329:4347" placeholder="..." />  
984 - <marker date="1461763907000" expanded="true" signature="4399:4409" placeholder="..." />  
985 - <marker date="1461763907000" expanded="true" signature="4436:4499" placeholder="..." /> 955 + <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />
  956 + <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />
  957 + <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />
  958 + <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />
  959 + <marker date="1461763907000" expanded="true" signature="-1:-1" placeholder="..." />
986 </folding> 960 </folding>
987 </state> 961 </state>
988 </provider> 962 </provider>
@@ -1027,6 +1001,14 @@ @@ -1027,6 +1001,14 @@
1027 </state> 1001 </state>
1028 </provider> 1002 </provider>
1029 </entry> 1003 </entry>
  1004 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  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" />
  1008 + <folding />
  1009 + </state>
  1010 + </provider>
  1011 + </entry>
1030 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb"> 1012 <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
1031 <provider selected="true" editor-type-id="text-editor"> 1013 <provider selected="true" editor-type-id="text-editor">
1032 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315"> 1014 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
@@ -1035,10 +1017,10 @@ @@ -1035,10 +1017,10 @@
1035 </state> 1017 </state>
1036 </provider> 1018 </provider>
1037 </entry> 1019 </entry>
1038 - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb"> 1020 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
1039 <provider selected="true" editor-type-id="text-editor"> 1021 <provider selected="true" editor-type-id="text-editor">
1040 - <state vertical-scroll-proportion="-21.041666" vertical-offset="95" max-vertical-offset="810">  
1041 - <caret line="40" column="28" selection-start-line="40" selection-start-column="28" selection-end-line="40" selection-end-column="28" /> 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" />
1042 <folding /> 1024 <folding />
1043 </state> 1025 </state>
1044 </provider> 1026 </provider>
@@ -1046,7 +1028,7 @@ @@ -1046,7 +1028,7 @@
1046 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb"> 1028 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
1047 <provider selected="true" editor-type-id="text-editor"> 1029 <provider selected="true" editor-type-id="text-editor">
1048 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634"> 1030 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
1049 - <caret line="1" column="18" selection-start-line="1" selection-start-column="18" selection-end-line="1" selection-end-column="18" /> 1031 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
1050 <folding /> 1032 <folding />
1051 </state> 1033 </state>
1052 </provider> 1034 </provider>
1 PATH 1 PATH
2 remote: . 2 remote: .
3 specs: 3 specs:
4 - kanjai (0.0.8) 4 + kanjai (0.0.9)
5 acts_as_list 5 acts_as_list
6 acts_as_tree 6 acts_as_tree
7 aws-sdk 7 aws-sdk
@@ -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 "kanjai/general" %> 5 + <%= stylesheet_link_tag "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" %>
1 module Kanjai 1 module Kanjai
2 - VERSION = "0.0.9" 2 + VERSION = "0.0.10"
3 end 3 end