EDIT / kanjai · Commits

Commit e0dcb16f2c2f2dd7cc4446a3f40ae2ef1e14dac1

Authored by Karpikau Andrei
1 parent dcca60fe

add new fileupload element to frontend

Inline Side-by-side
Showing 6 changed files with 159 additions and 258 deletions
... ... @@ -38,59 +38,61 @@
38 38 <file leaf-file-name="html_editor.js" pinned="false" current-in-tab="false">
39 39 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
40 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="0.0" vertical-offset="2820" max-vertical-offset="5490">
42   - <caret line="213" column="32" selection-start-line="213" selection-start-column="23" selection-end-line="213" selection-end-column="32" />
  41 + <state vertical-scroll-proportion="-8.037037" vertical-offset="3848" max-vertical-offset="5745">
  42 + <caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" />
43 43 <folding>
44   - <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." />
45   - <marker date="1461763907000" expanded="true" signature="4297:4315" placeholder="..." />
46   - <marker date="1461763907000" expanded="true" signature="4329:4347" placeholder="..." />
47   - <marker date="1461763907000" expanded="true" signature="4399:4409" placeholder="..." />
48   - <marker date="1461763907000" expanded="true" signature="4436:4499" placeholder="..." />
  44 + <marker date="1469128371000" expanded="true" signature="2474:2516" placeholder="..." />
  45 + <marker date="1469128371000" expanded="true" signature="4297:4315" placeholder="..." />
  46 + <marker date="1469128371000" expanded="true" signature="4329:4347" placeholder="..." />
  47 + <marker date="1469128371000" expanded="true" signature="4399:4409" placeholder="..." />
  48 + <marker date="1469128371000" expanded="true" signature="4436:4499" placeholder="..." />
49 49 </folding>
50 50 </state>
51 51 </provider>
52 52 </entry>
53 53 </file>
54   - <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
55   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  54 + <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
  55 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
56 56 <provider selected="true" editor-type-id="text-editor">
57   - <state vertical-scroll-proportion="-12.916667" vertical-offset="1025" max-vertical-offset="1770">
58   - <caret line="89" column="88" selection-start-line="89" selection-start-column="88" selection-end-line="89" selection-end-column="88" />
59   - <folding />
  57 + <state vertical-scroll-proportion="0.0" vertical-offset="3195" max-vertical-offset="7155">
  58 + <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
  59 + <folding>
  60 + <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
  61 + <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
  62 + <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
  63 + <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
  64 + <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
  65 + </folding>
60 66 </state>
61 67 </provider>
62 68 </entry>
63 69 </file>
64   - <file leaf-file-name="html_generator.js" pinned="false" current-in-tab="false">
65   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  70 + <file leaf-file-name="admin_extend.js" pinned="false" current-in-tab="false">
  71 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
66 72 <provider selected="true" editor-type-id="text-editor">
67   - <state vertical-scroll-proportion="-19.148148" vertical-offset="2108" max-vertical-offset="8265">
68   - <caret line="175" column="51" selection-start-line="175" selection-start-column="51" selection-end-line="175" selection-end-column="51" />
69   - <folding>
70   - <marker date="1469094078000" expanded="true" signature="503:515" placeholder="..." />
71   - </folding>
  73 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  74 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  75 + <folding />
72 76 </state>
73 77 </provider>
74 78 </entry>
75 79 </file>
76   - <file leaf-file-name="fileinput.css" pinned="false" current-in-tab="false">
77   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css">
  80 + <file leaf-file-name="frontend.js" pinned="false" current-in-tab="false">
  81 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
78 82 <provider selected="true" editor-type-id="text-editor">
79   - <state vertical-scroll-proportion="0.0" vertical-offset="5441" max-vertical-offset="6075">
80   - <caret line="269" column="36" selection-start-line="269" selection-start-column="36" selection-end-line="269" selection-end-column="36" />
  83 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
  84 + <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
81 85 <folding />
82 86 </state>
83 87 </provider>
84 88 </entry>
85 89 </file>
86   - <file leaf-file-name="general.js" pinned="false" current-in-tab="false">
87   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
  90 + <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
  91 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
88 92 <provider selected="true" editor-type-id="text-editor">
89   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
90   - <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
91   - <folding>
92   - <element signature="n#!!doc" expanded="true" />
93   - </folding>
  93 + <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="1140">
  94 + <caret line="25" column="32" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="32" />
  95 + <folding />
94 96 </state>
95 97 </provider>
96 98 </entry>
... ... @@ -99,38 +101,42 @@
99 101 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
100 102 <provider selected="true" editor-type-id="text-editor">
101 103 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
102   - <caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
  104 + <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="32" />
103 105 <folding />
104 106 </state>
105 107 </provider>
106 108 </entry>
107 109 </file>
108   - <file leaf-file-name="general_admin.css.scss" pinned="false" current-in-tab="false">
109   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
  110 + <file leaf-file-name="frontend.css.scss" pinned="false" current-in-tab="false">
  111 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
110 112 <provider selected="true" editor-type-id="text-editor">
111   - <state vertical-scroll-proportion="-11.875" vertical-offset="0" max-vertical-offset="375">
112   - <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
  113 + <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
  114 + <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
113 115 <folding />
114 116 </state>
115 117 </provider>
116 118 </entry>
117 119 </file>
118   - <file leaf-file-name="page_content_marker.rb" pinned="false" current-in-tab="false">
119   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
  120 + <file leaf-file-name="html_generator.js" pinned="false" current-in-tab="false">
  121 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
120 122 <provider selected="true" editor-type-id="text-editor">
121   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="585">
122   - <caret line="29" column="52" selection-start-line="29" selection-start-column="52" selection-end-line="29" selection-end-column="52" />
123   - <folding />
  123 + <state vertical-scroll-proportion="0.0" vertical-offset="2183" max-vertical-offset="8265">
  124 + <caret line="180" column="27" selection-start-line="168" selection-start-column="0" selection-end-line="180" selection-end-column="27" />
  125 + <folding>
  126 + <marker date="1469094078000" expanded="true" signature="503:515" placeholder="..." />
  127 + </folding>
124 128 </state>
125 129 </provider>
126 130 </entry>
127 131 </file>
128   - <file leaf-file-name="admin.css.scss" pinned="false" current-in-tab="false">
129   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
  132 + <file leaf-file-name="general.js" pinned="false" current-in-tab="false">
  133 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
130 134 <provider selected="true" editor-type-id="text-editor">
131   - <state vertical-scroll-proportion="-6.1568627" vertical-offset="781" max-vertical-offset="2940">
132   - <caret line="73" column="35" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="35" />
133   - <folding />
  135 + <state vertical-scroll-proportion="0.0" vertical-offset="30" max-vertical-offset="135">
  136 + <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
  137 + <folding>
  138 + <element signature="n#!!doc" expanded="true" />
  139 + </folding>
134 140 </state>
135 141 </provider>
136 142 </entry>
... ... @@ -154,8 +160,6 @@
154 160 <option value="$PROJECT_DIR$/public/test_template/index.html" />
155 161 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/show_frontend_editor.html.erb" />
156 162 <option value="$PROJECT_DIR$/kanjai.gemspec" />
157   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
158   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
159 163 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
160 164 <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
161 165 <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
... ... @@ -165,7 +169,6 @@
165 169 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />
166 170 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
167 171 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
168   - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
169 172 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
170 173 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
171 174 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
... ... @@ -190,6 +193,9 @@
190 193 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js" />
191 194 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss" />
192 195 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
  196 + <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
  197 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
  198 + <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
193 199 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
194 200 </list>
195 201 </option>
... ... @@ -225,8 +231,6 @@
225 231 <sortByType />
226 232 </navigator>
227 233 <panes>
228   - <pane id="Scope" />
229   - <pane id="RailsProjectView" />
230 234 <pane id="ProjectPane">
231 235 <subPane>
232 236 <PATH>
... ... @@ -305,91 +309,9 @@
305 309 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
306 310 </PATH_ELEMENT>
307 311 <PATH_ELEMENT>
308   - <option name="myItemId" value="models" />
309   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
310   - </PATH_ELEMENT>
311   - <PATH_ELEMENT>
312   - <option name="myItemId" value="kanjai" />
313   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
314   - </PATH_ELEMENT>
315   - </PATH>
316   - <PATH>
317   - <PATH_ELEMENT>
318   - <option name="myItemId" value="kanjai" />
319   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
320   - </PATH_ELEMENT>
321   - <PATH_ELEMENT>
322   - <option name="myItemId" value="kanjai" />
323   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
324   - </PATH_ELEMENT>
325   - <PATH_ELEMENT>
326   - <option name="myItemId" value="app" />
327   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
328   - </PATH_ELEMENT>
329   - <PATH_ELEMENT>
330   - <option name="myItemId" value="controllers" />
331   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
332   - </PATH_ELEMENT>
333   - <PATH_ELEMENT>
334   - <option name="myItemId" value="kanjai" />
335   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
336   - </PATH_ELEMENT>
337   - </PATH>
338   - <PATH>
339   - <PATH_ELEMENT>
340   - <option name="myItemId" value="kanjai" />
341   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
342   - </PATH_ELEMENT>
343   - <PATH_ELEMENT>
344   - <option name="myItemId" value="kanjai" />
345   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
346   - </PATH_ELEMENT>
347   - <PATH_ELEMENT>
348   - <option name="myItemId" value="app" />
349   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
350   - </PATH_ELEMENT>
351   - <PATH_ELEMENT>
352 312 <option name="myItemId" value="assets" />
353 313 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
354 314 </PATH_ELEMENT>
355   - <PATH_ELEMENT>
356   - <option name="myItemId" value="stylesheets" />
357   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
358   - </PATH_ELEMENT>
359   - <PATH_ELEMENT>
360   - <option name="myItemId" value="kanjai" />
361   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
362   - </PATH_ELEMENT>
363   - </PATH>
364   - <PATH>
365   - <PATH_ELEMENT>
366   - <option name="myItemId" value="kanjai" />
367   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
368   - </PATH_ELEMENT>
369   - <PATH_ELEMENT>
370   - <option name="myItemId" value="kanjai" />
371   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
372   - </PATH_ELEMENT>
373   - <PATH_ELEMENT>
374   - <option name="myItemId" value="app" />
375   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
376   - </PATH_ELEMENT>
377   - <PATH_ELEMENT>
378   - <option name="myItemId" value="assets" />
379   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
380   - </PATH_ELEMENT>
381   - <PATH_ELEMENT>
382   - <option name="myItemId" value="stylesheets" />
383   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
384   - </PATH_ELEMENT>
385   - <PATH_ELEMENT>
386   - <option name="myItemId" value="kanjai" />
387   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
388   - </PATH_ELEMENT>
389   - <PATH_ELEMENT>
390   - <option name="myItemId" value="admin" />
391   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
392   - </PATH_ELEMENT>
393 315 </PATH>
394 316 <PATH>
395 317 <PATH_ELEMENT>
... ... @@ -435,64 +357,22 @@
435 357 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
436 358 </PATH_ELEMENT>
437 359 <PATH_ELEMENT>
438   - <option name="myItemId" value="images" />
439   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
440   - </PATH_ELEMENT>
441   - <PATH_ELEMENT>
442   - <option name="myItemId" value="kanjai" />
443   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
444   - </PATH_ELEMENT>
445   - </PATH>
446   - <PATH>
447   - <PATH_ELEMENT>
448   - <option name="myItemId" value="kanjai" />
449   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
450   - </PATH_ELEMENT>
451   - <PATH_ELEMENT>
452   - <option name="myItemId" value="kanjai" />
453   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
454   - </PATH_ELEMENT>
455   - <PATH_ELEMENT>
456   - <option name="myItemId" value="app" />
457   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
458   - </PATH_ELEMENT>
459   - <PATH_ELEMENT>
460   - <option name="myItemId" value="assets" />
461   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
462   - </PATH_ELEMENT>
463   - <PATH_ELEMENT>
464   - <option name="myItemId" value="images" />
465   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
466   - </PATH_ELEMENT>
467   - <PATH_ELEMENT>
468   - <option name="myItemId" value="kanjai" />
469   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
470   - </PATH_ELEMENT>
471   - <PATH_ELEMENT>
472   - <option name="myItemId" value="fileinput" />
  360 + <option name="myItemId" value="javascripts" />
473 361 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
474 362 </PATH_ELEMENT>
475   - </PATH>
476   - <PATH>
477   - <PATH_ELEMENT>
478   - <option name="myItemId" value="kanjai" />
479   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
480   - </PATH_ELEMENT>
481 363 <PATH_ELEMENT>
482 364 <option name="myItemId" value="kanjai" />
483 365 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
484 366 </PATH_ELEMENT>
485 367 <PATH_ELEMENT>
486   - <option name="myItemId" value="app" />
487   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
488   - </PATH_ELEMENT>
489   - <PATH_ELEMENT>
490   - <option name="myItemId" value="assets" />
  368 + <option name="myItemId" value="frontend" />
491 369 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
492 370 </PATH_ELEMENT>
493 371 </PATH>
494 372 </subPane>
495 373 </pane>
  374 + <pane id="RailsProjectView" />
  375 + <pane id="Scope" />
496 376 </panes>
497 377 </component>
498 378 <component name="PropertiesComponent">
... ... @@ -685,20 +565,20 @@
685 565 <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" />
686 566 <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" />
687 567 <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" />
688   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.42407107" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
689   - <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" />
690   - <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" />
  568 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4450727" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
691 569 <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" />
692 570 <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" />
693 571 <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" />
694 572 <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" />
695 573 <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" />
696   - <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" />
697 574 <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" />
  575 + <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" />
  576 + <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" />
698 577 <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" />
699 578 <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" />
700   - <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" />
  579 + <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" />
701 580 <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" />
  581 + <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" />
702 582 </layout>
703 583 </component>
704 584 <component name="Vcs.Log.UiProperties">
... ... @@ -722,13 +602,6 @@
722 602 <watches-manager />
723 603 </component>
724 604 <component name="editorHistoryManager">
725   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/index.html.erb">
726   - <provider selected="true" editor-type-id="text-editor">
727   - <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="585">
728   - <caret line="24" column="32" selection-start-line="24" selection-start-column="32" selection-end-line="24" selection-end-column="32" />
729   - </state>
730   - </provider>
731   - </entry>
732 605 <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
733 606 <provider selected="true" editor-type-id="text-editor">
734 607 <state vertical-scroll-proportion="0.0" vertical-offset="915" max-vertical-offset="1845">
... ... @@ -750,13 +623,6 @@
750 623 </state>
751 624 </provider>
752 625 </entry>
753   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
754   - <provider selected="true" editor-type-id="text-editor">
755   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
756   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
757   - </state>
758   - </provider>
759   - </entry>
760 626 <entry file="file://$PROJECT_DIR$/Gemfile">
761 627 <provider selected="true" editor-type-id="text-editor">
762 628 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
... ... @@ -849,13 +715,6 @@
849 715 </state>
850 716 </provider>
851 717 </entry>
852   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
853   - <provider selected="true" editor-type-id="text-editor">
854   - <state vertical-scroll-proportion="0.0" vertical-offset="483" max-vertical-offset="1140">
855   - <caret line="47" column="27" selection-start-line="47" selection-start-column="20" selection-end-line="47" selection-end-column="27" />
856   - </state>
857   - </provider>
858   - </entry>
859 718 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
860 719 <provider selected="true" editor-type-id="text-editor">
861 720 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -923,15 +782,6 @@
923 782 <provider selected="true" editor-type-id="text-editor">
924 783 <state vertical-scroll-proportion="0.0" vertical-offset="507" max-vertical-offset="22110">
925 784 <caret line="52" column="17" selection-start-line="52" selection-start-column="17" selection-end-line="52" selection-end-column="17" />
926   - <folding />
927   - </state>
928   - </provider>
929   - </entry>
930   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
931   - <provider selected="true" editor-type-id="text-editor">
932   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7155">
933   - <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
934   - <folding />
935 785 </state>
936 786 </provider>
937 787 </entry>
... ... @@ -953,7 +803,6 @@
953 803 <provider selected="true" editor-type-id="text-editor">
954 804 <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="1035">
955 805 <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
956   - <folding />
957 806 </state>
958 807 </provider>
959 808 </entry>
... ... @@ -996,44 +845,49 @@
996 845 <provider selected="true" editor-type-id="text-editor">
997 846 <state vertical-scroll-proportion="0.0" vertical-offset="50" max-vertical-offset="660">
998 847 <caret line="21" column="100" selection-start-line="21" selection-start-column="81" selection-end-line="21" selection-end-column="100" />
999   - <folding />
1000 848 </state>
1001 849 </provider>
1002 850 </entry>
1003   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
  851 + <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
1004 852 <provider selected="true" editor-type-id="text-editor">
1005   - <state vertical-scroll-proportion="0.0" vertical-offset="109" max-vertical-offset="540">
1006   - <caret line="27" column="0" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="28" />
1007   - <folding />
  853 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
  854 + <caret line="5" column="58" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
1008 855 </state>
1009 856 </provider>
1010 857 </entry>
1011   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
  858 + <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
1012 859 <provider selected="true" editor-type-id="text-editor">
1013   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
1014   - <caret line="5" column="58" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
1015   - <folding />
  860 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="585">
  861 + <caret line="29" column="52" selection-start-line="29" selection-start-column="52" selection-end-line="29" selection-end-column="52" />
1016 862 </state>
1017 863 </provider>
1018 864 </entry>
1019   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
  865 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
1020 866 <provider selected="true" editor-type-id="text-editor">
1021   - <state vertical-scroll-proportion="0.0" vertical-offset="2820" max-vertical-offset="5490">
1022   - <caret line="213" column="32" selection-start-line="213" selection-start-column="23" selection-end-line="213" selection-end-column="32" />
1023   - <folding>
1024   - <marker date="1461763907000" expanded="true" signature="2474:2516" placeholder="..." />
1025   - <marker date="1461763907000" expanded="true" signature="4297:4315" placeholder="..." />
1026   - <marker date="1461763907000" expanded="true" signature="4329:4347" placeholder="..." />
1027   - <marker date="1461763907000" expanded="true" signature="4399:4409" placeholder="..." />
1028   - <marker date="1461763907000" expanded="true" signature="4436:4499" placeholder="..." />
1029   - </folding>
  867 + <state vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="375">
  868 + <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
1030 869 </state>
1031 870 </provider>
1032 871 </entry>
1033   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
  872 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css">
1034 873 <provider selected="true" editor-type-id="text-editor">
1035   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="585">
1036   - <caret line="29" column="52" selection-start-line="29" selection-start-column="52" selection-end-line="29" selection-end-column="52" />
  874 + <state vertical-scroll-proportion="0.0" vertical-offset="5441" max-vertical-offset="6075">
  875 + <caret line="269" column="36" selection-start-line="269" selection-start-column="36" selection-end-line="269" selection-end-column="36" />
  876 + </state>
  877 + </provider>
  878 + </entry>
  879 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
  880 + <provider selected="true" editor-type-id="text-editor">
  881 + <state vertical-scroll-proportion="0.0" vertical-offset="781" max-vertical-offset="2940">
  882 + <caret line="73" column="35" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="35" />
  883 + <folding />
  884 + </state>
  885 + </provider>
  886 + </entry>
  887 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  888 + <provider selected="true" editor-type-id="text-editor">
  889 + <state vertical-scroll-proportion="0.0" vertical-offset="1025" max-vertical-offset="1770">
  890 + <caret line="89" column="88" selection-start-line="89" selection-start-column="88" selection-end-line="89" selection-end-column="88" />
1037 891 <folding />
1038 892 </state>
1039 893 </provider>
... ... @@ -1048,52 +902,80 @@
1048 902 </state>
1049 903 </provider>
1050 904 </entry>
1051   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
  905 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
1052 906 <provider selected="true" editor-type-id="text-editor">
1053   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
1054   - <caret line="8" column="32" selection-start-line="8" selection-start-column="32" selection-end-line="8" selection-end-column="32" />
  907 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7155">
  908 + <caret line="301" column="0" selection-start-line="301" selection-start-column="0" selection-end-line="301" selection-end-column="0" />
  909 + <folding>
  910 + <marker date="1461307505000" expanded="true" signature="1842:1884" placeholder="..." />
  911 + <marker date="1461307505000" expanded="true" signature="4089:4107" placeholder="..." />
  912 + <marker date="1461307505000" expanded="true" signature="4121:4139" placeholder="..." />
  913 + <marker date="1461307505000" expanded="true" signature="4191:4201" placeholder="..." />
  914 + <marker date="1461307505000" expanded="true" signature="4228:4291" placeholder="..." />
  915 + </folding>
  916 + </state>
  917 + </provider>
  918 + </entry>
  919 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
  920 + <provider selected="true" editor-type-id="text-editor">
  921 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  922 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1055 923 <folding />
1056 924 </state>
1057 925 </provider>
1058 926 </entry>
1059   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
  927 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
1060 928 <provider selected="true" editor-type-id="text-editor">
1061   - <state vertical-scroll-proportion="-11.875" vertical-offset="0" max-vertical-offset="375">
1062   - <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
  929 + <state vertical-scroll-proportion="0.0" vertical-offset="2183" max-vertical-offset="8265">
  930 + <caret line="180" column="27" selection-start-line="168" selection-start-column="0" selection-end-line="180" selection-end-column="27" />
  931 + <folding>
  932 + <marker date="1469094078000" expanded="true" signature="503:515" placeholder="..." />
  933 + </folding>
  934 + </state>
  935 + </provider>
  936 + </entry>
  937 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
  938 + <provider selected="true" editor-type-id="text-editor">
  939 + <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="1140">
  940 + <caret line="25" column="32" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="32" />
1063 941 <folding />
1064 942 </state>
1065 943 </provider>
1066 944 </entry>
1067   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css">
  945 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
1068 946 <provider selected="true" editor-type-id="text-editor">
1069   - <state vertical-scroll-proportion="0.0" vertical-offset="5441" max-vertical-offset="6075">
1070   - <caret line="269" column="36" selection-start-line="269" selection-start-column="36" selection-end-line="269" selection-end-column="36" />
  947 + <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
  948 + <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
1071 949 <folding />
1072 950 </state>
1073 951 </provider>
1074 952 </entry>
1075   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  953 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
1076 954 <provider selected="true" editor-type-id="text-editor">
1077   - <state vertical-scroll-proportion="-19.148148" vertical-offset="2108" max-vertical-offset="8265">
1078   - <caret line="175" column="51" selection-start-line="175" selection-start-column="51" selection-end-line="175" selection-end-column="51" />
  955 + <state vertical-scroll-proportion="-8.037037" vertical-offset="3848" max-vertical-offset="5745">
  956 + <caret line="271" column="22" selection-start-line="271" selection-start-column="22" selection-end-line="271" selection-end-column="22" />
1079 957 <folding>
1080   - <marker date="1469094078000" expanded="true" signature="503:515" placeholder="..." />
  958 + <marker date="1469128371000" expanded="true" signature="2474:2516" placeholder="..." />
  959 + <marker date="1469128371000" expanded="true" signature="4297:4315" placeholder="..." />
  960 + <marker date="1469128371000" expanded="true" signature="4329:4347" placeholder="..." />
  961 + <marker date="1469128371000" expanded="true" signature="4399:4409" placeholder="..." />
  962 + <marker date="1469128371000" expanded="true" signature="4436:4499" placeholder="..." />
1081 963 </folding>
1082 964 </state>
1083 965 </provider>
1084 966 </entry>
1085   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
  967 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js">
1086 968 <provider selected="true" editor-type-id="text-editor">
1087   - <state vertical-scroll-proportion="-6.1568627" vertical-offset="781" max-vertical-offset="2940">
1088   - <caret line="73" column="35" selection-start-line="73" selection-start-column="21" selection-end-line="73" selection-end-column="35" />
  969 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
  970 + <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="32" />
1089 971 <folding />
1090 972 </state>
1091 973 </provider>
1092 974 </entry>
1093   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
  975 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
1094 976 <provider selected="true" editor-type-id="text-editor">
1095   - <state vertical-scroll-proportion="-12.916667" vertical-offset="1025" max-vertical-offset="1770">
1096   - <caret line="89" column="88" selection-start-line="89" selection-start-column="88" selection-end-line="89" selection-end-column="88" />
  977 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
  978 + <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
1097 979 <folding />
1098 980 </state>
1099 981 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.51)
  4 + kanjai (0.0.52)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ...
... ... @@ -25,6 +25,7 @@
25 25 //= require kanjai/froala_editor/plugins/url.min
26 26 //= require kanjai/froala_editor/plugins/video.min
27 27
  28 +//= require kanjai/lib/fileinput
28 29 //= require kanjai/jquery-ui
29 30 //= require kanjai/admin/jquery.fileupload
30 31
... ...
... ... @@ -223,6 +223,8 @@ var csrf_token = $('meta[name=csrf-token]').attr('content'),
223 223
224 224 selector.find(".ajax-file-upload-form input:file").each(function () {
225 225 initFileInput($(this));
  226 +
  227 +
226 228 });
227 229
228 230
... ... @@ -267,7 +269,22 @@ var csrf_token = $('meta[name=csrf-token]').attr('content'),
267 269
268 270 var $data = $(data);
269 271
270   - modal = $data.modal({
  272 + $data.find(".fileupload-field").each(function(){
  273 + var $this = $(this),
  274 + $previewBlock = $this.next(),
  275 + options = {'showUpload':false};
  276 +
  277 + if($previewBlock) {
  278 + options['initialPreview'] = $previewBlock.html();
  279 + $previewBlock.remove();
  280 + }
  281 +
  282 +
  283 + $this.fileinput(options);
  284 + });
  285 +
  286 +
  287 + modal = $data.modal({
271 288 show: true,
272 289 backdrop: false
273 290 }).on('shown.bs.modal', function (e) {
... ...
... ... @@ -15,4 +15,5 @@
15 15
16 16 //= require kanjai/font_awesome_4_4/font-awesome
17 17
  18 +//= require kanjai/fileinput
18 19 //= require kanjai/frontend/html_editor
\ No newline at end of file
... ...
1 1 module Kanjai
2   - VERSION = "0.0.52"
  2 + VERSION = "0.0.53"
3 3 end
... ...