EDIT / kanjai · Commits

Commit e23f133dfb4130536ef6c7ad582b520ab381a9a0

Authored by Karpikau Andrei
1 parent efdbc07d

check file upload for RTE

Inline Side-by-side
Showing 18 changed files with 467 additions and 326 deletions
... ... @@ -136,9 +136,9 @@
136 136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.5, rbenv: 2.1.3) [gem]" level="application" />
137 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.4.0, rbenv: 2.1.3) [gem]" level="application" />
138 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.4.2, rbenv: 2.1.3) [gem]" level="application" />
140   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.3.22, rbenv: 2.1.3) [gem]" level="application" />
141   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.3.22, rbenv: 2.1.3) [gem]" level="application" />
  139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.4.3, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.4.3, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.4.3, rbenv: 2.1.3) [gem]" level="application" />
142 142 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 143 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
144 144 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -153,10 +153,10 @@
153 153 <orderEntry type="library" scope="PROVIDED" name="execjs (v2.7.0, rbenv: 2.1.3) [gem]" level="application" />
154 154 <orderEntry type="library" scope="PROVIDED" name="factory_girl (v4.7.0, rbenv: 2.1.3) [gem]" level="application" />
155 155 <orderEntry type="library" scope="PROVIDED" name="factory_girl_rails (v4.7.0, rbenv: 2.1.3) [gem]" level="application" />
156   - <orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.6, rbenv: 2.1.3) [gem]" level="application" />
  156 + <orderEntry type="library" scope="PROVIDED" name="globalid (v0.3.7, rbenv: 2.1.3) [gem]" level="application" />
157 157 <orderEntry type="library" scope="PROVIDED" name="i18n (v0.7.0, rbenv: 2.1.3) [gem]" level="application" />
158 158 <orderEntry type="library" scope="PROVIDED" name="jbuilder (v2.6.0, rbenv: 2.1.3) [gem]" level="application" />
159   - <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.0, rbenv: 2.1.3) [gem]" level="application" />
  159 + <orderEntry type="library" scope="PROVIDED" name="jmespath (v1.3.1, rbenv: 2.1.3) [gem]" level="application" />
160 160 <orderEntry type="library" scope="PROVIDED" name="jquery-rails (v3.1.2, rbenv: 2.1.3) [gem]" level="application" />
161 161 <orderEntry type="library" scope="PROVIDED" name="json (v1.8.3, rbenv: 2.1.3) [gem]" level="application" />
162 162 <orderEntry type="library" scope="PROVIDED" name="libv8 (v3.16.14.15, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -192,7 +192,7 @@
192 192 <orderEntry type="library" scope="PROVIDED" name="sass (v3.4.22, rbenv: 2.1.3) [gem]" level="application" />
193 193 <orderEntry type="library" scope="PROVIDED" name="sass-rails (v5.0.6, rbenv: 2.1.3) [gem]" level="application" />
194 194 <orderEntry type="library" scope="PROVIDED" name="sdoc (v0.4.1, rbenv: 2.1.3) [gem]" level="application" />
195   - <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.6.3, rbenv: 2.1.3) [gem]" level="application" />
  195 + <orderEntry type="library" scope="PROVIDED" name="sprockets (v3.7.0, rbenv: 2.1.3) [gem]" level="application" />
196 196 <orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v3.1.1, rbenv: 2.1.3) [gem]" level="application" />
197 197 <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.2, rbenv: 2.1.3) [gem]" level="application" />
198 198 <orderEntry type="library" scope="PROVIDED" name="thor (v0.19.1, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -35,102 +35,103 @@
35 35 </provider>
36 36 </entry>
37 37 </file>
38   - <file leaf-file-name="rails.js" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
  38 + <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
  39 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
40 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="7125">
42   - <caret line="15" column="55" selection-start-line="15" selection-start-column="55" selection-end-line="15" selection-end-column="55" />
  41 + <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="1485">
  42 + <caret line="25" column="27" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="27" />
43 43 <folding />
44 44 </state>
45 45 </provider>
46 46 </entry>
47 47 </file>
48   - <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  48 + <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
  49 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
50 50 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="2925">
52   - <caret line="123" column="64" selection-start-line="123" selection-start-column="64" selection-end-line="123" selection-end-column="64" />
53   - <folding />
  51 + <state vertical-scroll-proportion="0.0" vertical-offset="2919" max-vertical-offset="7845">
  52 + <caret line="210" column="0" selection-start-line="210" selection-start-column="0" selection-end-line="210" selection-end-column="0" />
  53 + <folding>
  54 + <marker date="1470342771000" expanded="true" signature="1842:1884" placeholder="..." />
  55 + <marker date="1470342771000" expanded="true" signature="4090:4108" placeholder="..." />
  56 + <marker date="1470342771000" expanded="true" signature="4122:4140" placeholder="..." />
  57 + <marker date="1470342771000" expanded="true" signature="4192:4202" placeholder="..." />
  58 + <marker date="1470342771000" expanded="true" signature="4229:4292" placeholder="..." />
  59 + </folding>
54 60 </state>
55 61 </provider>
56 62 </entry>
57 63 </file>
58   - <file leaf-file-name="marker.html.erb" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb">
  64 + <file leaf-file-name="jquery.fileupload.js" pinned="false" current-in-tab="false">
  65 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
60 66 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="570">
62   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  67 + <state vertical-scroll-proportion="0.0" vertical-offset="807" max-vertical-offset="22110">
  68 + <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
63 69 <folding />
64 70 </state>
65 71 </provider>
66 72 </entry>
67 73 </file>
68   - <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
69   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  74 + <file leaf-file-name="gallery.html.erb" pinned="false" current-in-tab="false">
  75 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/gallery.html.erb">
70 76 <provider selected="true" editor-type-id="text-editor">
71   - <state vertical-scroll-proportion="0.0" vertical-offset="2400" max-vertical-offset="4635">
72   - <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
73   - <folding />
  77 + <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="735">
  78 + <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
  79 + <folding>
  80 + <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
  81 + <element signature="n#t('drop_your_file')#0;n#!!top" expanded="false" />
  82 + </folding>
74 83 </state>
75 84 </provider>
76 85 </entry>
77 86 </file>
78   - <file leaf-file-name="application_helper.rb" pinned="false" current-in-tab="false">
79   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  87 + <file leaf-file-name="_preview.html.erb" pinned="false" current-in-tab="false">
  88 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
80 89 <provider selected="true" editor-type-id="text-editor">
81   - <state vertical-scroll-proportion="0.0" vertical-offset="581" max-vertical-offset="1215">
82   - <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
  90 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  91 + <caret line="0" column="42" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="42" />
83 92 <folding />
84 93 </state>
85 94 </provider>
86 95 </entry>
87 96 </file>
88   - <file leaf-file-name="new.html.erb" pinned="false" current-in-tab="false">
89   - <entry file="file://$PROJECT_DIR$/app/views/devise/confirmations/new.html.erb">
  97 + <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
  98 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
90 99 <provider selected="true" editor-type-id="text-editor">
91   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="375">
92   - <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
93   - <folding />
  100 + <state vertical-scroll-proportion="0.0" vertical-offset="1778" max-vertical-offset="4635">
  101 + <caret line="148" column="12" selection-start-line="148" selection-start-column="6" selection-end-line="148" selection-end-column="12" />
  102 + <folding>
  103 + <element signature="e#2689#2725#0" expanded="false" />
  104 + <element signature="e#2768#2808#0" expanded="false" />
  105 + </folding>
94 106 </state>
95 107 </provider>
96 108 </entry>
97 109 </file>
98   - <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
99   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
  110 + <file leaf-file-name="delete_gallery_image.js.erb" pinned="false" current-in-tab="false">
  111 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb">
100 112 <provider selected="true" editor-type-id="text-editor">
101   - <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="660">
102   - <caret line="10" column="63" selection-start-line="10" selection-start-column="55" selection-end-line="10" selection-end-column="63" />
  113 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
  114 + <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
103 115 <folding />
104 116 </state>
105 117 </provider>
106 118 </entry>
107 119 </file>
108   - <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
109   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
  120 + <file leaf-file-name="update_gallery.js.erb" pinned="false" current-in-tab="false">
  121 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/update_gallery.js.erb">
110 122 <provider selected="true" editor-type-id="text-editor">
111   - <state vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1380">
112   - <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
113   - <folding>
114   - <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
115   - <element signature="e#404#441#0#ruby" expanded="false" />
116   - <element signature="e#524#567#0#ruby" expanded="false" />
117   - <element signature="e#945#995#0#ruby" expanded="false" />
118   - <element signature="e#1349#1395#0#ruby" expanded="false" />
119   - <element signature="e#1643#1697#0#ruby" expanded="false" />
120   - <element signature="e#1942#1985#0#ruby" expanded="false" />
121   - <element signature="e#2462#2520#0#ruby" expanded="false" />
122   - <element signature="e#2709#2748#0#ruby" expanded="false" />
123   - <element signature="e#3031#3068#0#ruby" expanded="false" />
124   - </folding>
  123 + <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="135">
  124 + <caret line="1" column="61" selection-start-line="1" selection-start-column="61" selection-end-line="1" selection-end-column="61" />
  125 + <folding />
125 126 </state>
126 127 </provider>
127 128 </entry>
128 129 </file>
129   - <file leaf-file-name="print_template.rb" pinned="false" current-in-tab="false">
130   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/print_template.rb">
  130 + <file leaf-file-name="_gallery_exist_images.html.erb" pinned="false" current-in-tab="false">
  131 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_gallery_exist_images.html.erb">
131 132 <provider selected="true" editor-type-id="text-editor">
132   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="225">
133   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  133 + <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="210">
  134 + <caret line="8" column="9" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
134 135 <folding />
135 136 </state>
136 137 </provider>
... ... @@ -141,19 +142,10 @@
141 142 <component name="IdeDocumentHistory">
142 143 <option name="CHANGED_PATHS">
143 144 <list>
144   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_langs/edit.html.erb" />
145   - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/page_langs_controller.rb" />
146   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb" />
147   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/index.html.erb" />
148   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb" />
149   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/create/_success.js.erb" />
150   - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb" />
151 145 <option value="$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb" />
152   - <option value="$PROJECT_DIR$/config/routes.rb" />
153 146 <option value="$PROJECT_DIR$/public/test_template/index.html" />
154 147 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" />
155 148 <option value="$PROJECT_DIR$/kanjai.gemspec" />
156   - <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
157 149 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
158 150 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
159 151 <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
... ... @@ -175,22 +167,31 @@
175 167 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
176 168 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
177 169 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
178   - <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
179   - <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
180 170 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
181 171 <option value="$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb" />
182 172 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
183 173 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
184 174 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css" />
185   - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss" />
186 175 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
187   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
188 176 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
189   - <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
190   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
191   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
192 177 <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
193 178 <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
  179 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
  180 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
  181 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
  182 + <option value="$PROJECT_DIR$/db/migrate/20160804133136_add_image_link_to_kanjai_images.rb" />
  183 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/get_gallery.html.erb" />
  184 + <option value="$PROJECT_DIR$/config/routes.rb" />
  185 + <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss" />
  186 + <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
  187 + <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
  188 + <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
  189 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_gallery_exist_images.html.erb" />
  190 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/gallery.html.erb" />
  191 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/update_gallery.js.erb" />
  192 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
  193 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb" />
  194 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" />
194 195 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
195 196 </list>
196 197 </option>
... ... @@ -226,6 +227,7 @@
226 227 <sortByType />
227 228 </navigator>
228 229 <panes>
  230 + <pane id="Scope" />
229 231 <pane id="RailsProjectView" />
230 232 <pane id="ProjectPane">
231 233 <subPane>
... ... @@ -287,33 +289,7 @@
287 289 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
288 290 </PATH_ELEMENT>
289 291 <PATH_ELEMENT>
290   - <option name="myItemId" value="app" />
291   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
292   - </PATH_ELEMENT>
293   - <PATH_ELEMENT>
294   - <option name="myItemId" value="views" />
295   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
296   - </PATH_ELEMENT>
297   - </PATH>
298   - <PATH>
299   - <PATH_ELEMENT>
300   - <option name="myItemId" value="kanjai" />
301   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
302   - </PATH_ELEMENT>
303   - <PATH_ELEMENT>
304   - <option name="myItemId" value="kanjai" />
305   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
306   - </PATH_ELEMENT>
307   - <PATH_ELEMENT>
308   - <option name="myItemId" value="app" />
309   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
310   - </PATH_ELEMENT>
311   - <PATH_ELEMENT>
312   - <option name="myItemId" value="views" />
313   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
314   - </PATH_ELEMENT>
315   - <PATH_ELEMENT>
316   - <option name="myItemId" value="kanjai" />
  292 + <option name="myItemId" value="config" />
317 293 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
318 294 </PATH_ELEMENT>
319 295 </PATH>
... ... @@ -345,17 +321,12 @@
345 321 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
346 322 </PATH_ELEMENT>
347 323 <PATH_ELEMENT>
348   - <option name="myItemId" value="helpers" />
349   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
350   - </PATH_ELEMENT>
351   - <PATH_ELEMENT>
352   - <option name="myItemId" value="kanjai" />
  324 + <option name="myItemId" value="assets" />
353 325 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
354 326 </PATH_ELEMENT>
355 327 </PATH>
356 328 </subPane>
357 329 </pane>
358   - <pane id="Scope" />
359 330 </panes>
360 331 </component>
361 332 <component name="PropertiesComponent">
... ... @@ -552,20 +523,20 @@
552 523 <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" />
553 524 <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" />
554 525 <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" />
555   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.48142165" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  526 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.35218093" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
556 527 <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" />
557 528 <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32930514" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
558 529 <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" />
559 530 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
560 531 <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" />
561   - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32930514" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
562 532 <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" />
  533 + <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" />
563 534 <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 535 <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" />
565 536 <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" />
566   - <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" />
567   - <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" />
568 537 <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" />
  538 + <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" />
  539 + <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" />
569 540 </layout>
570 541 </component>
571 542 <component name="Vcs.Log.UiProperties">
... ... @@ -585,376 +556,382 @@
585 556 </option>
586 557 </component>
587 558 <component name="XDebuggerManager">
588   - <breakpoint-manager />
  559 + <breakpoint-manager>
  560 + <option name="time" value="1" />
  561 + </breakpoint-manager>
589 562 <watches-manager />
590 563 </component>
591 564 <component name="editorHistoryManager">
592   - <entry file="file://$PROJECT_DIR$/config/initializers/assets.rb">
  565 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
593 566 <provider selected="true" editor-type-id="text-editor">
594 567 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
595 568 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
596 569 </state>
597 570 </provider>
598 571 </entry>
599   - <entry file="file://$PROJECT_DIR$/lib/kanjai/engine.rb">
  572 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
600 573 <provider selected="true" editor-type-id="text-editor">
601   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="435">
602   - <caret line="16" column="181" selection-start-line="16" selection-start-column="181" selection-end-line="16" selection-end-column="181" />
  574 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
  575 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
603 576 </state>
604 577 </provider>
605 578 </entry>
606   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  579 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
607 580 <provider selected="true" editor-type-id="text-editor">
608   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
609   - <caret line="1" column="29" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="29" />
  581 + <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="1035">
  582 + <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
610 583 </state>
611 584 </provider>
612 585 </entry>
613   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_datum.rb">
  586 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
614 587 <provider selected="true" editor-type-id="text-editor">
615   - <state vertical-scroll-proportion="0.0" vertical-offset="101" max-vertical-offset="735">
616   - <caret line="39" column="15" selection-start-line="39" selection-start-column="15" selection-end-line="39" selection-end-column="15" />
  588 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  589 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
617 590 </state>
618 591 </provider>
619 592 </entry>
620   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
  593 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
621 594 <provider selected="true" editor-type-id="text-editor">
622   - <state vertical-scroll-proportion="0.4369085" vertical-offset="1673" max-vertical-offset="2520">
623   - <caret line="130" column="57" selection-start-line="130" selection-start-column="57" selection-end-line="130" selection-end-column="57" />
  595 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  596 + <caret line="5" column="58" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
624 597 </state>
625 598 </provider>
626 599 </entry>
627   - <entry file="file://$PROJECT_DIR$/lib/kanjai/content_function.rb">
  600 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
628 601 <provider selected="true" editor-type-id="text-editor">
629   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2520">
630   - <caret line="5" column="15" selection-start-line="5" selection-start-column="8" selection-end-line="5" selection-end-column="15" />
  602 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="585">
  603 + <caret line="29" column="52" selection-start-line="29" selection-start-column="52" selection-end-line="29" selection-end-column="52" />
631 604 </state>
632 605 </provider>
633 606 </entry>
634   - <entry file="file://$PROJECT_DIR$/config/initializers/admin.rb">
  607 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
635 608 <provider selected="true" editor-type-id="text-editor">
636   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
637   - <caret line="0" column="12" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="12" />
  609 + <state vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="375">
  610 + <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
638 611 </state>
639 612 </provider>
640 613 </entry>
641   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  614 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css">
642 615 <provider selected="true" editor-type-id="text-editor">
643   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
644   - <caret line="16" column="34" selection-start-line="16" selection-start-column="34" selection-end-line="16" selection-end-column="34" />
  616 + <state vertical-scroll-proportion="0.0" vertical-offset="5441" max-vertical-offset="6075">
  617 + <caret line="269" column="36" selection-start-line="269" selection-start-column="36" selection-end-line="269" selection-end-column="36" />
645 618 </state>
646 619 </provider>
647 620 </entry>
648   - <entry file="file://$PROJECT_DIR$/README.rdoc">
  621 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
649 622 <provider selected="true" editor-type-id="text-editor">
650   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
651   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  623 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
  624 + <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
652 625 </state>
653 626 </provider>
654 627 </entry>
655   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
  628 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
656 629 <provider selected="true" editor-type-id="text-editor">
657   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  630 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
658 631 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
659 632 </state>
660 633 </provider>
661 634 </entry>
662   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_parser.rb">
  635 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
663 636 <provider selected="true" editor-type-id="text-editor">
664   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2250">
665   - <caret line="71" column="40" selection-start-line="71" selection-start-column="40" selection-end-line="71" selection-end-column="40" />
  637 + <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
  638 + <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
666 639 </state>
667 640 </provider>
668 641 </entry>
669   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_contents/add_item.html.erb">
  642 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
670 643 <provider selected="true" editor-type-id="text-editor">
671   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="810">
672   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  644 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
  645 + <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
673 646 </state>
674 647 </provider>
675 648 </entry>
676   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
  649 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
677 650 <provider selected="true" editor-type-id="text-editor">
678   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
679   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  651 + <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
  652 + <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
680 653 </state>
681 654 </provider>
682 655 </entry>
683   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
  656 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
684 657 <provider selected="true" editor-type-id="text-editor">
685 658 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
686 659 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
687 660 </state>
688 661 </provider>
689 662 </entry>
690   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
  663 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
691 664 <provider selected="true" editor-type-id="text-editor">
692   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
693   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  665 + <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="7125">
  666 + <caret line="15" column="55" selection-start-line="15" selection-start-column="55" selection-end-line="15" selection-end-column="55" />
694 667 </state>
695 668 </provider>
696 669 </entry>
697   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
  670 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
698 671 <provider selected="true" editor-type-id="text-editor">
699   - <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="615">
700   - <caret line="6" column="61" selection-start-line="6" selection-start-column="47" selection-end-line="6" selection-end-column="61" />
  672 + <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="1140">
  673 + <caret line="25" column="32" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="32" />
701 674 </state>
702 675 </provider>
703 676 </entry>
704   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
  677 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/print_template.rb">
705 678 <provider selected="true" editor-type-id="text-editor">
706   - <state vertical-scroll-proportion="0.0" vertical-offset="507" max-vertical-offset="22110">
707   - <caret line="52" column="17" selection-start-line="52" selection-start-column="17" selection-end-line="52" selection-end-column="17" />
  679 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  680 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
708 681 </state>
709 682 </provider>
710 683 </entry>
711   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
  684 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb">
712 685 <provider selected="true" editor-type-id="text-editor">
713   - <state vertical-scroll-proportion="-8.851851" vertical-offset="1261" max-vertical-offset="1650">
714   - <caret line="100" column="144" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="144" />
  686 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  687 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
715 688 </state>
716 689 </provider>
717 690 </entry>
718   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
  691 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
719 692 <provider selected="true" editor-type-id="text-editor">
720   - <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="1035">
721   - <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
  693 + <state vertical-scroll-proportion="0.0" vertical-offset="2400" max-vertical-offset="4635">
  694 + <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
722 695 </state>
723 696 </provider>
724 697 </entry>
725   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  698 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
726 699 <provider selected="true" editor-type-id="text-editor">
727   - <state vertical-scroll-proportion="0.0" vertical-offset="1118" max-vertical-offset="4275">
728   - <caret line="99" column="45" selection-start-line="99" selection-start-column="45" selection-end-line="99" selection-end-column="45" />
  700 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
  701 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
729 702 </state>
730 703 </provider>
731 704 </entry>
732   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  705 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
733 706 <provider selected="true" editor-type-id="text-editor">
734   - <state vertical-scroll-proportion="-10.259259" vertical-offset="728" max-vertical-offset="1410">
735   - <caret line="67" column="10" selection-start-line="67" selection-start-column="10" selection-end-line="67" selection-end-column="10" />
  707 + <state vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1380">
  708 + <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
736 709 </state>
737 710 </provider>
738 711 </entry>
739   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  712 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
740 713 <provider selected="true" editor-type-id="text-editor">
741   - <state vertical-scroll-proportion="0.0" vertical-offset="945" max-vertical-offset="2685">
742   - <caret line="18" column="46" selection-start-line="18" selection-start-column="46" selection-end-line="18" selection-end-column="46" />
  714 + <state vertical-scroll-proportion="0.0" vertical-offset="581" max-vertical-offset="1215">
  715 + <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
743 716 </state>
744 717 </provider>
745 718 </entry>
746   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
  719 + <entry file="file://$PROJECT_DIR$/app/views/devise/confirmations/new.html.erb">
747 720 <provider selected="true" editor-type-id="text-editor">
748   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
749   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  721 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="375">
  722 + <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
750 723 </state>
751 724 </provider>
752 725 </entry>
753   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  726 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
754 727 <provider selected="true" editor-type-id="text-editor">
755   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
756   - <caret line="5" column="58" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
  728 + <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="2685">
  729 + <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
757 730 </state>
758 731 </provider>
759 732 </entry>
760   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
  733 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/fileinput.js">
761 734 <provider selected="true" editor-type-id="text-editor">
762   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="585">
763   - <caret line="29" column="52" selection-start-line="29" selection-start-column="52" selection-end-line="29" selection-end-column="52" />
  735 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="49005">
  736 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
764 737 </state>
765 738 </provider>
766 739 </entry>
767   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
  740 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
768 741 <provider selected="true" editor-type-id="text-editor">
769   - <state vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="375">
770   - <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
  742 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="675">
  743 + <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="28" />
771 744 </state>
772 745 </provider>
773 746 </entry>
774   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css">
  747 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
775 748 <provider selected="true" editor-type-id="text-editor">
776   - <state vertical-scroll-proportion="0.0" vertical-offset="5441" max-vertical-offset="6075">
777   - <caret line="269" column="36" selection-start-line="269" selection-start-column="36" selection-end-line="269" selection-end-column="36" />
  749 + <state vertical-scroll-proportion="-5.75" vertical-offset="72" max-vertical-offset="615">
  750 + <caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
778 751 </state>
779 752 </provider>
780 753 </entry>
781   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
  754 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
782 755 <provider selected="true" editor-type-id="text-editor">
783   - <state vertical-scroll-proportion="0.0" vertical-offset="781" max-vertical-offset="2940">
784   - <caret line="73" column="35" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="35" />
  756 + <state vertical-scroll-proportion="0.45918366" vertical-offset="135" max-vertical-offset="660">
  757 + <caret line="21" column="204" selection-start-line="21" selection-start-column="67" selection-end-line="21" selection-end-column="204" />
785 758 </state>
786 759 </provider>
787 760 </entry>
788   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
  761 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content.rb">
789 762 <provider selected="true" editor-type-id="text-editor">
790   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
791   - <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
  763 + <state vertical-scroll-proportion="-75.0" vertical-offset="0" max-vertical-offset="2520">
  764 + <caret line="135" column="69" selection-start-line="135" selection-start-column="68" selection-end-line="135" selection-end-column="69" />
792 765 </state>
793 766 </provider>
794 767 </entry>
795   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
  768 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
796 769 <provider selected="true" editor-type-id="text-editor">
797   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
798   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  770 + <state vertical-scroll-proportion="0.0" vertical-offset="1234" max-vertical-offset="1650">
  771 + <caret line="100" column="144" selection-start-line="100" selection-start-column="6" selection-end-line="100" selection-end-column="144" />
799 772 </state>
800 773 </provider>
801 774 </entry>
802   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
  775 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
803 776 <provider selected="true" editor-type-id="text-editor">
804   - <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
805   - <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
  777 + <state vertical-scroll-proportion="0.0" vertical-offset="1025" max-vertical-offset="1770">
  778 + <caret line="89" column="76" selection-start-line="89" selection-start-column="76" selection-end-line="89" selection-end-column="76" />
806 779 </state>
807 780 </provider>
808 781 </entry>
809   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
  782 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
810 783 <provider selected="true" editor-type-id="text-editor">
811   - <state vertical-scroll-proportion="0.0" vertical-offset="3848" max-vertical-offset="5745">
812   - <caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" />
  784 + <state vertical-scroll-proportion="0.56782335" vertical-offset="1485" max-vertical-offset="2925">
  785 + <caret line="123" column="64" selection-start-line="123" selection-start-column="39" selection-end-line="123" selection-end-column="64" />
813 786 </state>
814 787 </provider>
815 788 </entry>
816   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
  789 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
817 790 <provider selected="true" editor-type-id="text-editor">
818   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
819   - <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="32" />
  791 + <state vertical-scroll-proportion="0.0" vertical-offset="1755" max-vertical-offset="8550">
  792 + <caret line="146" column="33" selection-start-line="146" selection-start-column="33" selection-end-line="146" selection-end-column="33" />
  793 + <folding />
820 794 </state>
821 795 </provider>
822 796 </entry>
823   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  797 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
824 798 <provider selected="true" editor-type-id="text-editor">
825   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
826   - <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
  799 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="5745">
  800 + <caret line="280" column="0" selection-start-line="280" selection-start-column="0" selection-end-line="280" selection-end-column="0" />
  801 + <folding />
827 802 </state>
828 803 </provider>
829 804 </entry>
830   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  805 + <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
831 806 <provider selected="true" editor-type-id="text-editor">
832   - <state vertical-scroll-proportion="0.0" vertical-offset="560" max-vertical-offset="1770">
833   - <caret line="47" column="0" selection-start-line="47" selection-start-column="0" selection-end-line="47" selection-end-column="0" />
  807 + <state vertical-scroll-proportion="0.04731861" vertical-offset="0" max-vertical-offset="634">
  808 + <caret line="2" column="73" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
834 809 </state>
835 810 </provider>
836 811 </entry>
837   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  812 + <entry file="file://$PROJECT_DIR$/db/migrate/20160804133136_add_image_link_to_kanjai_images.rb">
838 813 <provider selected="true" editor-type-id="text-editor">
839   - <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
840   - <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
  814 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="165">
  815 + <caret line="2" column="51" selection-start-line="2" selection-start-column="51" selection-end-line="2" selection-end-column="51" />
841 816 </state>
842 817 </provider>
843 818 </entry>
844   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
  819 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/get_gallery.html.erb">
845 820 <provider selected="true" editor-type-id="text-editor">
846   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
847   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  821 + <state vertical-scroll-proportion="-1.25" vertical-offset="0" max-vertical-offset="165">
  822 + <caret line="2" column="242" selection-start-line="2" selection-start-column="242" selection-end-line="2" selection-end-column="242" />
848 823 </state>
849 824 </provider>
850 825 </entry>
851   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
  826 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
852 827 <provider selected="true" editor-type-id="text-editor">
853   - <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="7125">
854   - <caret line="15" column="55" selection-start-line="15" selection-start-column="55" selection-end-line="15" selection-end-column="55" />
855   - <folding />
  828 + <state vertical-scroll-proportion="0.0" vertical-offset="281" max-vertical-offset="960">
  829 + <caret line="30" column="9" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
856 830 </state>
857 831 </provider>
858 832 </entry>
859   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  833 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
860 834 <provider selected="true" editor-type-id="text-editor">
861   - <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="1140">
862   - <caret line="25" column="32" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="32" />
  835 + <state vertical-scroll-proportion="-24.166666" vertical-offset="2735" max-vertical-offset="3420">
  836 + <caret line="221" column="18" selection-start-line="221" selection-start-column="18" selection-end-line="221" selection-end-column="18" />
863 837 </state>
864 838 </provider>
865 839 </entry>
866   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/print_template.rb">
  840 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
867 841 <provider selected="true" editor-type-id="text-editor">
868   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
869   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  842 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
  843 + <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
870 844 <folding />
871 845 </state>
872 846 </provider>
873 847 </entry>
874   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
  848 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_contents_controller.rb">
875 849 <provider selected="true" editor-type-id="text-editor">
876   - <state vertical-scroll-proportion="0.0" vertical-offset="165" max-vertical-offset="2925">
877   - <caret line="123" column="64" selection-start-line="123" selection-start-column="64" selection-end-line="123" selection-end-column="64" />
878   - <folding />
  850 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="750">
  851 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
879 852 </state>
880 853 </provider>
881 854 </entry>
882   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  855 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
883 856 <provider selected="true" editor-type-id="text-editor">
884   - <state vertical-scroll-proportion="0.81072557" vertical-offset="1766" max-vertical-offset="8535">
885   - <caret line="152" column="59" selection-start-line="152" selection-start-column="59" selection-end-line="152" selection-end-column="59" />
  857 + <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="1485">
  858 + <caret line="25" column="27" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="27" />
  859 + <folding />
886 860 </state>
887 861 </provider>
888 862 </entry>
889   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  863 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_gallery_exist_images.html.erb">
890 864 <provider selected="true" editor-type-id="text-editor">
891   - <state vertical-scroll-proportion="0.27129337" vertical-offset="3038" max-vertical-offset="6870">
892   - <caret line="214" column="23" selection-start-line="214" selection-start-column="4" selection-end-line="214" selection-end-column="23" />
  865 + <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="210">
  866 + <caret line="8" column="9" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
  867 + <folding />
893 868 </state>
894 869 </provider>
895 870 </entry>
896   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/marker.html.erb">
  871 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/update_gallery.js.erb">
897 872 <provider selected="true" editor-type-id="text-editor">
898   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
899   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  873 + <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="135">
  874 + <caret line="1" column="61" selection-start-line="1" selection-start-column="61" selection-end-line="1" selection-end-column="61" />
900 875 <folding />
901 876 </state>
902 877 </provider>
903 878 </entry>
904   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  879 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/gallery.html.erb">
905 880 <provider selected="true" editor-type-id="text-editor">
906   - <state vertical-scroll-proportion="0.0" vertical-offset="2400" max-vertical-offset="4635">
907   - <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
908   - <folding />
  881 + <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="735">
  882 + <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
  883 + <folding>
  884 + <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
  885 + <element signature="n#t('drop_your_file')#0;n#!!top" expanded="false" />
  886 + </folding>
909 887 </state>
910 888 </provider>
911 889 </entry>
912   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
  890 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
913 891 <provider selected="true" editor-type-id="text-editor">
914   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
915   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  892 + <state vertical-scroll-proportion="0.0" vertical-offset="807" max-vertical-offset="22110">
  893 + <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
  894 + <folding />
916 895 </state>
917 896 </provider>
918 897 </entry>
919   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
  898 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
920 899 <provider selected="true" editor-type-id="text-editor">
921   - <state vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1380">
922   - <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
  900 + <state vertical-scroll-proportion="0.0" vertical-offset="2919" max-vertical-offset="7845">
  901 + <caret line="210" column="0" selection-start-line="210" selection-start-column="0" selection-end-line="210" selection-end-column="0" />
923 902 <folding>
924   - <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
925   - <element signature="e#404#441#0#ruby" expanded="false" />
926   - <element signature="e#524#567#0#ruby" expanded="false" />
927   - <element signature="e#945#995#0#ruby" expanded="false" />
928   - <element signature="e#1349#1395#0#ruby" expanded="false" />
929   - <element signature="e#1643#1697#0#ruby" expanded="false" />
930   - <element signature="e#1942#1985#0#ruby" expanded="false" />
931   - <element signature="e#2462#2520#0#ruby" expanded="false" />
932   - <element signature="e#2709#2748#0#ruby" expanded="false" />
933   - <element signature="e#3031#3068#0#ruby" expanded="false" />
  903 + <marker date="1470342771000" expanded="true" signature="1842:1884" placeholder="..." />
  904 + <marker date="1470342771000" expanded="true" signature="4090:4108" placeholder="..." />
  905 + <marker date="1470342771000" expanded="true" signature="4122:4140" placeholder="..." />
  906 + <marker date="1470342771000" expanded="true" signature="4192:4202" placeholder="..." />
  907 + <marker date="1470342771000" expanded="true" signature="4229:4292" placeholder="..." />
934 908 </folding>
935 909 </state>
936 910 </provider>
937 911 </entry>
938   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  912 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
939 913 <provider selected="true" editor-type-id="text-editor">
940   - <state vertical-scroll-proportion="0.0" vertical-offset="581" max-vertical-offset="1215">
941   - <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
  914 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="315">
  915 + <caret line="0" column="42" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="42" />
942 916 <folding />
943 917 </state>
944 918 </provider>
945 919 </entry>
946   - <entry file="file://$PROJECT_DIR$/app/views/devise/confirmations/new.html.erb">
  920 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
947 921 <provider selected="true" editor-type-id="text-editor">
948   - <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="375">
949   - <caret line="5" column="19" selection-start-line="5" selection-start-column="19" selection-end-line="5" selection-end-column="19" />
950   - <folding />
  922 + <state vertical-scroll-proportion="0.0" vertical-offset="1778" max-vertical-offset="4635">
  923 + <caret line="148" column="12" selection-start-line="148" selection-start-column="6" selection-end-line="148" selection-end-column="12" />
  924 + <folding>
  925 + <element signature="e#2689#2725#0" expanded="false" />
  926 + <element signature="e#2768#2808#0" expanded="false" />
  927 + </folding>
951 928 </state>
952 929 </provider>
953 930 </entry>
954   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
  931 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb">
955 932 <provider selected="true" editor-type-id="text-editor">
956   - <state vertical-scroll-proportion="-6.25" vertical-offset="0" max-vertical-offset="660">
957   - <caret line="10" column="63" selection-start-line="10" selection-start-column="55" selection-end-line="10" selection-end-column="63" />
  933 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  934 + <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
958 935 <folding />
959 936 </state>
960 937 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.55)
  4 + kanjai (0.0.56)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -64,12 +64,12 @@ GEM
64 64 acts_as_tree (2.4.0)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.3.22)
68   - aws-sdk-resources (= 2.3.22)
69   - aws-sdk-core (2.3.22)
  67 + aws-sdk (2.4.3)
  68 + aws-sdk-resources (= 2.4.3)
  69 + aws-sdk-core (2.4.3)
70 70 jmespath (~> 1.0)
71   - aws-sdk-resources (2.3.22)
72   - aws-sdk-core (= 2.3.22)
  71 + aws-sdk-resources (2.4.3)
  72 + aws-sdk-core (= 2.4.3)
73 73 backport_new_renderer (1.0.0)
74 74 rails
75 75 bcrypt (3.1.11)
... ... @@ -95,13 +95,13 @@ GEM
95 95 factory_girl_rails (4.7.0)
96 96 factory_girl (~> 4.7.0)
97 97 railties (>= 3.0.0)
98   - globalid (0.3.6)
  98 + globalid (0.3.7)
99 99 activesupport (>= 4.1.0)
100 100 i18n (0.7.0)
101   - jbuilder (2.5.0)
  101 + jbuilder (2.6.0)
102 102 activesupport (>= 3.0.0, < 5.1)
103 103 multi_json (~> 1.2)
104   - jmespath (1.3.0)
  104 + jmespath (1.3.1)
105 105 jquery-rails (3.1.2)
106 106 railties (>= 3.0, < 5.0)
107 107 thor (>= 0.14, < 2.0)
... ... @@ -177,7 +177,7 @@ GEM
177 177 rspec-support (~> 3.4.0)
178 178 rspec-support (3.4.1)
179 179 sass (3.4.22)
180   - sass-rails (5.0.5)
  180 + sass-rails (5.0.6)
181 181 railties (>= 4.0.0, < 6)
182 182 sass (~> 3.1)
183 183 sprockets (>= 2.8, < 4.0)
... ... @@ -186,7 +186,7 @@ GEM
186 186 sdoc (0.4.1)
187 187 json (~> 1.7, >= 1.7.7)
188 188 rdoc (~> 4.0)
189   - sprockets (3.6.3)
  189 + sprockets (3.7.0)
190 190 concurrent-ruby (~> 1.0)
191 191 rack (> 1, < 3)
192 192 sprockets-rails (3.1.1)
... ...
... ... @@ -98,6 +98,7 @@ var initAjaxFileUpload = function(selector){
98 98 selector.find(".ajax-file-upload-form input:file").each(function(){
99 99 var $this = $(this),
100 100 filesList = $this.data('files');
  101 +
101 102 if(filesList == undefined){
102 103 filesList = [];
103 104 }
... ... @@ -151,6 +152,7 @@ var initAjaxFileUpload = function(selector){
151 152 var class_name = fileInputElem.attr('name').replace (/[\[\]]/g, '-');
152 153
153 154 var fileUploadItem = fileInputElem.fileupload({
  155 + dropZone: $('<div></div>'),
154 156 fileInput: fileInputElem,
155 157 url: fileInputElem.data('url'),
156 158 type: 'POST',
... ... @@ -201,13 +203,21 @@ var initAjaxFileUpload = function(selector){
201 203 };
202 204
203 205 selector.find(".ajax-file-upload-form input:file").each(function () {
204   - initFileInput($(this));
  206 + var $this = $(this);
  207 + if($this.data('init') == undefined){
  208 + $this.data('init', true);
  209 + initFileInput($this);
  210 + }
  211 +
205 212 });
206 213
207 214
208 215
209 216 selector.find('.ajax-file-upload-form').submit(addFileForAjaxUpload);
210 217
  218 + $(document).bind('drop dragover', function (e) {
  219 + e.preventDefault();
  220 + });
211 221
212 222 return this;
213 223 };
... ... @@ -221,10 +231,6 @@ var clearAjaxFileUpload = function(selector){
221 231 jQuery(document).ready(function(){
222 232
223 233
224   -
225   -
226   -
227   -
228 234 $.FroalaEditor.DEFAULTS.key = 'kKC1KXDF1INBh1KPe2TK==';
229 235
230 236 $.FroalaEditor.DefineIcon('cms-image', {NAME: 'image'});
... ... @@ -254,9 +260,6 @@ jQuery(document).ready(function(){
254 260 $popover = $('.fr-fullscreen').find('*[data-cmd="cms-image"]');
255 261 }
256 262
257   -
258   -
259   -
260 263 $popover.popover({
261 264 content: $data,
262 265 html: true,
... ... @@ -293,20 +296,8 @@ jQuery(document).ready(function(){
293 296 }
294 297 });
295 298
296   -
297   -
298   -
299   -
300 299 initAjaxFileUpload($(document));
301 300
302   -
303   -
304   -
305   -
306   -
307   -
308   -
309   -
310 301 $(document).on('click','.remove_fields', function(){
311 302 jQuery(this).prev("input[type=hidden]").val("1");
312 303 var obj = jQuery(this).closest(".fields");
... ... @@ -373,9 +364,6 @@ jQuery(document).ready(function(){
373 364
374 365 if($('#page_html_content').length > 0){
375 366
376   - //CKEDITOR.replace('page_html_content', {
377   - // customConfig: 'ckeditor_config.js'
378   - //});
379 367
380 368 $('#page_html_content').froalaEditor({
381 369 theme: 'gray',
... ... @@ -393,6 +381,83 @@ jQuery(document).ready(function(){
393 381 // DRAG and DROP file
394 382 var available_file_type = ['image/jpeg', 'image/pjpeg', 'image/png', 'image/gif'];
395 383
  384 + $('.drop-down-upload').each(function(){
  385 + var dropZone = $(this),
  386 + $dropWrapper = dropZone.find('.drop'),
  387 + upload_url = $dropWrapper.data('url'),
  388 + upload_form_data = $dropWrapper.data('form-data'),
  389 + upload_host = $dropWrapper.data('host'),
  390 + file_index = 0;
  391 +
  392 +
  393 + if (typeof(window.FileReader) == 'undefined') {
  394 + dropZone.html("your browser don't support this function");
  395 + }else {
  396 + dropZone[0].ondrop = function (e) {
  397 + e.preventDefault();
  398 + var file = e.dataTransfer.files[0],
  399 + input_name = "gallery_image[" + file_index + "]",
  400 + $fileInput = $('<div><input name="' + input_name + '" type="file" class="fileupload-field"></div>');
  401 +
  402 + file_index = file_index + 1;
  403 +
  404 + $fileInput.find('.fileupload-field').data('url', upload_url);
  405 + $fileInput.find('.fileupload-field').data('form-data', upload_form_data);
  406 + $fileInput.find('.fileupload-field').data('host', upload_host);
  407 +
  408 +
  409 + $fileInput.find('.fileupload-field').data('files', [{input_name: input_name, file: file}]);
  410 +
  411 + var reader = new FileReader();
  412 + reader.onload = function (evt) {
  413 + var options = {
  414 + showUpload:false,
  415 + dropZoneEnabled: false,
  416 + initialPreview: ["<img src='"+ evt.target.result +"' class='file-preview-image' alt='' title=''>"]
  417 + };
  418 +
  419 + $fileInput.find('.fileupload-field').fileinput(options);
  420 +
  421 + $fileInput.find('.fileupload-field').on('fileclear', function(event) {
  422 + $(this).closest('.file-input').remove();
  423 + });
  424 +
  425 + $fileInput.find('.fileupload-field').on('change', function(event) {
  426 +
  427 + });
  428 +
  429 + $('#gallery_form form #new_images').append($fileInput);
  430 +
  431 + $('#gallery_form form input:submit').removeClass('not-visible');
  432 +
  433 + clearAjaxFileUpload($('#gallery_form'));
  434 + initAjaxFileUpload($('#gallery_form'));
  435 +
  436 + };
  437 + reader.readAsDataURL(file);
  438 +
  439 +
  440 +
  441 + };
  442 +
  443 + dropZone[0].ondragover = function (e) {
  444 + e.preventDefault();
  445 +
  446 + var dataTransfer = e.dataTransfer;
  447 + dataTransfer.dropEffect = 'copy';
  448 + //dropZone.addClass('over');
  449 + };
  450 +
  451 + dropZone[0].ondragleave = function (e) {
  452 + e.preventDefault();
  453 +
  454 + //dropZone.removeClass('over');
  455 + };
  456 +
  457 + }
  458 +
  459 + });
  460 +
396 461 $(document).on('click','.delete-file', function(){
397 462 var $this = $(this),
398 463 url = $this.attr('href');
... ...
... ... @@ -126,8 +126,9 @@ jQuery(document).ready(function(){
126 126 });
127 127
128 128 initializeFieldForm = function($selector){
129   - if($selector.find('#page_content_form .page_html_content').length > 0) {
130   - $selector.find('#page_content_form .page_html_content').froalaEditor({
  129 + if($selector.find('.page_html_content').length > 0) {
  130 +
  131 + $selector.find('.page_html_content').froalaEditor({
131 132 theme: 'gray',
132 133 height: 400,
133 134 toolbarButtons: ['underline', 'fontFamily', 'fontSize', 'color', 'paragraphStyle', 'paragraphFormat', 'align', 'formatOL', 'formatUL', 'outdent', 'indent', 'quote', 'insertHR', 'insertLink', 'cms-image', 'insertTable', 'undo', 'redo', 'clearFormatting', 'html', 'fullscreen']
... ...
... ... @@ -188,3 +188,36 @@
188 188
189 189 /* HTML GENERATOR END */
190 190
  191 +#gallery_form .file-preview {
  192 + display: inline-block;
  193 + width: auto;
  194 +}
  195 +
  196 +#gallery_form .file-input{
  197 + display: inline-block;
  198 + float: left;
  199 + margin:20px;
  200 +}
  201 +
  202 +#gallery_form .file-caption-main{
  203 + display: none;
  204 +}
  205 +
  206 +#gallery_form .file-preview-frame .kv-file-content {
  207 + width:200px;
  208 + height: 200px;
  209 + display: block;
  210 +}
  211 +
  212 +#gallery_form .file-preview-frame img{
  213 + display: block;
  214 + max-width:100%;
  215 + max-height:100%;
  216 + margin: 0 auto;
  217 +}
  218 +
  219 +/* EMPTY BLOCK */
  220 +.empty-block{
  221 + text-align: center;
  222 + font-size: 18px;
  223 +}
\ No newline at end of file
... ...
... ... @@ -127,8 +127,32 @@ module Kanjai
127 127
128 128 def gallery
129 129 @page = Page.find(params[:id])
  130 + @s3_direct_post = S3_BUCKET.presigned_post(key: "#{@page.get_image_file_path}${filename}", success_action_status: '201', acl: 'public-read')
130 131 end
131 132
  133 +
  134 + def update_gallery
  135 + @page = Page.find(params[:id])
  136 +
  137 + params[:gallery_image] ||= {}
  138 + params[:gallery_image].each do |key, url|
  139 + @page.images.create({
  140 + image_link: url
  141 + })
  142 +
  143 + end
  144 +
  145 + end
  146 +
  147 + def delete_gallery_image
  148 + @page = Page.find(params[:id])
  149 + @image = @page.images.find(params[:image_id])
  150 +
  151 + @image.destroy
  152 +
  153 + end
  154 +
  155 +
132 156 def meta
133 157 @page = Page.find(params[:id])
134 158 @page_data = @page.page_data.find_by_lang(params[:lang])
... ...
... ... @@ -9,11 +9,6 @@ module Kanjai
9 9 # :url => ':s3_domain_url'
10 10
11 11
12   - def get_file_path
13   - "#{self.object_type.gsub('_', '-').downcase}/#{self.object_id}/images/#{self.id}"
14   - end
15   -
16   -
17 12 default_scope { order('created_at') }
18 13
19 14 end
... ...
... ... @@ -23,6 +23,11 @@ module Kanjai
23 23
24 24 attr_accessor :title
25 25
  26 + def get_image_file_path
  27 + "images/pages/#{id}/"
  28 + end
  29 +
  30 +
26 31 def menu_url(scheme, lang = nil)
27 32
28 33 lang = I18n.locale.to_s if lang.nil?
... ...
  1 +<% if @page.images.count == 0 %>
  2 + <p class="empty-block">Image not exist</p>
  3 +<% else %>
  4 + <div class="gallery-list">
  5 + <% @page.images.each do |item| %>
  6 + <%= render :partial => 'preview', :locals => {item: item} %>
  7 + <% end %>
  8 + </div>
  9 +<% end %>
\ No newline at end of file
... ...
1   -<div class="image-preview-block">
2   - <div class="image-preview">
3   - <%= image_tag item.image.url(:mini) %>
4   - </div>
5   - <div class="operation">
6   - <%= link_to '<i class="glyphicon glyphicon-trash"></i>'.html_safe, url_for(:controller => '/upload', :action => 'delete_file', :model => 'image', :field => 'image', :id => item.id), :class => 'delete-file' %>
7   - </div>
  1 +<div class="file-input" id="gallery_image_<%= item.id %>">
  2 + <div class="file-preview ">
  3 + <div class="close fileinput-remove"><%= link_to '×', delete_gallery_image_admin_page_path(@page, image_id: item.id), remote: true %></div>
  4 + <div class="file-drop-disabled">
  5 + <div class="file-preview-thumbnails">
  6 + <div class="file-initial-thumbs">
  7 + <div class="file-preview-frame file-preview-initial">
  8 + <div class="kv-file-content">
  9 + <%= image_tag item.image_link, class: 'file-preview-image' %>
  10 + </div>
  11 + </div>
  12 + </div>
  13 + </div>
  14 + </div>
  15 + </div>
8 16 </div>
\ No newline at end of file
... ...
  1 +$('#gallery_image_<%= @image.id %>').remove();
\ No newline at end of file
... ...
... ... @@ -7,19 +7,29 @@
7 7
8 8 <div class="drop-down-upload">
9 9 <div style="padding:10px;">
10   - <div class="drop" data-object_model="page" data-object_id="<%= @page.id %>" data-extend_path="">
  10 + <div class="drop" data-url="<%= @s3_direct_post.url %>" data-form-data="<%= @s3_direct_post.fields.to_json %>" data-host="<%= URI.parse(@s3_direct_post.url).host %>" >
11 11 <%= t('drop_your_file') %>
12 12 <div class="dropped-file-list row"></div>
13 13 </div>
14 14 </div>
15 15 </div>
16 16
17   - <div class="gallery-list">
18   - <% @page.images.each do |item| %>
19   - <%= render :partial => 'preview', :locals => {item: item} %>
20   - <% end %>
21   - </div>
  17 + <div id="gallery_form">
  18 + <form action="<%= update_gallery_admin_page_url(@page) %>" class="ajax-file-upload-form">
  19 + <input type="submit" value="Save" class="btn btn-default not-visible" />
  20 + <div id="new_images">
  21 +
  22 + </div>
  23 + </form>
  24 +
  25 + <div class="clearfix"></div>
22 26
  27 + <h2>Exist Image</h2>
  28 +
  29 + <div id="exist_images">
  30 + <%= render partial: 'kanjai/admin/pages/gallery_exist_images' %>
  31 + </div>
  32 + </div>
23 33
24 34 </div>
25 35
... ...
1 1 <div>
2 2 <% @collection.each do |item| %>
3   - <a href="<%= item.image.url(:original, false) %>" class="gallery-item" style="display:inline-block;width:200px;height:200px;border:1px solid black;"><%= image_tag item.image.url(:mini), :style => 'display:inline-block;margin:0;padding:0;' %></a>
  3 + <a href="<%= item.image_link %>" class="gallery-item" style="display:inline-block;width:200px;height:200px;border:1px solid black;"><%= image_tag item.image_link, :style => 'display:inline-block;margin:0;padding:0;max-width:100px;' %></a>
4 4 <% end %>
5 5 </div>
... ...
  1 +$('#gallery_form form #new_images').html('');
  2 +$('#gallery_form form input:submit').addClass('not-visible');
  3 +
  4 +$('#exist_images').html('<%=j render partial: 'kanjai/admin/pages/gallery_exist_images' %>');
\ No newline at end of file
... ...
... ... @@ -25,7 +25,11 @@ Kanjai::Engine.routes.draw do
25 25 get :html, on: :member
26 26 get :meta, on: :member
27 27 post :meta_update, on: :member
  28 +
28 29 get :gallery, on: :member
  30 + post :update_gallery, on: :member
  31 + get :delete_gallery_image, on: :member
  32 +
29 33 post :get_gallery, on: :member
30 34 get :sort, on: :member
31 35 get :structure, on: :member
... ...
  1 +class AddImageLinkToKanjaiImages < ActiveRecord::Migration
  2 + def change
  3 + add_column :kanjai_images, :image_link, :string
  4 + end
  5 +end
... ...
1 1 module Kanjai
2   - VERSION = "0.0.56"
  2 + VERSION = "0.0.57"
3 3 end
... ...