EDIT / kanjai · Commits

Commit 0366bef7c025c5acef17bf376299f9b6dba5f8fc

Authored by Karpikau Andrei
1 parent 99dfc8ad

set row as fluid

Inline Side-by-side
Showing 5 changed files with 201 additions and 312 deletions
... ... @@ -133,12 +133,12 @@
133 133 <orderEntry type="library" scope="PROVIDED" name="activemodel (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
134 134 <orderEntry type="library" scope="PROVIDED" name="activerecord (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
135 135 <orderEntry type="library" scope="PROVIDED" name="activesupport (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
136   - <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.7.5, rbenv: 2.1.3) [gem]" level="application" />
137   - <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.5.0, rbenv: 2.1.3) [gem]" level="application" />
  136 + <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.1, rbenv: 2.1.3) [gem]" level="application" />
  137 + <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.5.1, 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.5.3, rbenv: 2.1.3) [gem]" level="application" />
140   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.5.1, rbenv: 2.1.3) [gem]" level="application" />
141   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.5.1, rbenv: 2.1.3) [gem]" level="application" />
  139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.5.11, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.5.3, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.5.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" />
... ... @@ -172,7 +172,7 @@
172 172 <orderEntry type="library" scope="PROVIDED" name="pg (v0.17.1, rbenv: 2.1.3) [gem]" level="application" />
173 173 <orderEntry type="library" scope="PROVIDED" name="rack (v1.6.4, rbenv: 2.1.3) [gem]" level="application" />
174 174 <orderEntry type="library" scope="PROVIDED" name="rack-test (v0.6.3, rbenv: 2.1.3) [gem]" level="application" />
175   - <orderEntry type="library" scope="PROVIDED" name="rails (v4.2.6, rbenv: 2.1.3) [gem]" level="application" />
  175 + <orderEntry type="library" scope="PROVIDED" name="rails (v4.2.7.1, rbenv: 2.1.3) [gem]" level="application" />
176 176 <orderEntry type="library" scope="PROVIDED" name="rails-deprecated_sanitizer (v1.0.3, rbenv: 2.1.3) [gem]" level="application" />
177 177 <orderEntry type="library" scope="PROVIDED" name="rails-dom-testing (v1.0.7, rbenv: 2.1.3) [gem]" level="application" />
178 178 <orderEntry type="library" scope="PROVIDED" name="rails-html-sanitizer (v1.0.3, rbenv: 2.1.3) [gem]" level="application" />
... ... @@ -199,7 +199,7 @@
199 199 <orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.3.5, rbenv: 2.1.3) [gem]" level="application" />
200 200 <orderEntry type="library" scope="PROVIDED" name="tilt (v2.0.5, rbenv: 2.1.3) [gem]" level="application" />
201 201 <orderEntry type="library" scope="PROVIDED" name="tzinfo (v1.2.2, rbenv: 2.1.3) [gem]" level="application" />
202   - <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.1, rbenv: 2.1.3) [gem]" level="application" />
  202 + <orderEntry type="library" scope="PROVIDED" name="uglifier (v3.0.2, rbenv: 2.1.3) [gem]" level="application" />
203 203 <orderEntry type="library" scope="PROVIDED" name="warden (v1.2.6, rbenv: 2.1.3) [gem]" level="application" />
204 204 </component>
205 205 <component name="RModuleSettingsStorage">
... ...
... ... @@ -25,107 +25,109 @@
25 25 </component>
26 26 <component name="FileEditorManager">
27 27 <leaf>
28   - <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
29   - <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
  28 + <file leaf-file-name="structure.html.erb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
32   - <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
33   - <folding />
  31 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="675">
  32 + <caret line="5" column="132" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="132" />
  33 + <folding>
  34 + <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
  35 + </folding>
34 36 </state>
35 37 </provider>
36 38 </entry>
37 39 </file>
38   - <file leaf-file-name="admin_controller.rb" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  40 + <file leaf-file-name="show_editor.html.erb" pinned="false" current-in-tab="false">
  41 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
40 42 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="375">
42   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
43   - <folding />
  43 + <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="615">
  44 + <caret line="24" column="16" selection-start-line="0" selection-start-column="0" selection-end-line="35" selection-end-column="9" />
  45 + <folding>
  46 + <element signature="e#360#414#0#ruby" expanded="false" />
  47 + <element signature="e#1122#1141#0#ruby" expanded="false" />
  48 + <element signature="e#1197#1216#0#ruby" expanded="false" />
  49 + </folding>
44 50 </state>
45 51 </provider>
46 52 </entry>
47 53 </file>
48   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
49   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  54 + <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
  55 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
50 56 <provider selected="true" editor-type-id="text-editor">
51   - <state vertical-scroll-proportion="0.0" vertical-offset="945" max-vertical-offset="2685">
52   - <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
  57 + <state vertical-scroll-proportion="0.0" vertical-offset="353" max-vertical-offset="960">
  58 + <caret line="49" column="26" selection-start-line="0" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
53 59 <folding />
54 60 </state>
55 61 </provider>
56 62 </entry>
57 63 </file>
58   - <file leaf-file-name="admin.js" pinned="false" current-in-tab="false">
59   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  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">
60 66 <provider selected="true" editor-type-id="text-editor">
61   - <state vertical-scroll-proportion="0.0" vertical-offset="2919" max-vertical-offset="7845">
62   - <caret line="210" column="0" selection-start-line="210" selection-start-column="0" selection-end-line="210" selection-end-column="0" />
  67 + <state vertical-scroll-proportion="0.0" vertical-offset="3188" max-vertical-offset="8550">
  68 + <caret line="226" column="0" selection-start-line="226" selection-start-column="0" selection-end-line="232" selection-end-column="7" />
63 69 <folding>
64   - <marker date="1470342771000" expanded="true" signature="1842:1884" placeholder="..." />
65   - <marker date="1470342771000" expanded="true" signature="4090:4108" placeholder="..." />
66   - <marker date="1470342771000" expanded="true" signature="4122:4140" placeholder="..." />
67   - <marker date="1470342771000" expanded="true" signature="4192:4202" placeholder="..." />
68   - <marker date="1470342771000" expanded="true" signature="4229:4292" placeholder="..." />
  70 + <marker date="1470228118000" expanded="true" signature="503:515" placeholder="..." />
69 71 </folding>
70 72 </state>
71 73 </provider>
72 74 </entry>
73 75 </file>
74   - <file leaf-file-name="general_admin.css.scss" pinned="false" current-in-tab="false">
75   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
  76 + <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
  77 + <entry file="file://$PROJECT_DIR$/Gemfile">
76 78 <provider selected="true" editor-type-id="text-editor">
77   - <state vertical-scroll-proportion="-0.625" vertical-offset="0" max-vertical-offset="390">
78   - <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
  79 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="255">
  80 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
79 81 <folding />
80 82 </state>
81 83 </provider>
82 84 </entry>
83 85 </file>
84   - <file leaf-file-name="admin_extend.css.scss" pinned="false" current-in-tab="false">
85   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin_extend.css.scss">
  86 + <file leaf-file-name="kanjai.gemspec" pinned="false" current-in-tab="false">
  87 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
86 88 <provider selected="true" editor-type-id="text-editor">
87   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
88   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  89 + <state vertical-scroll-proportion="0.0" vertical-offset="218" max-vertical-offset="1140">
  90 + <caret line="28" column="20" selection-start-line="28" selection-start-column="18" selection-end-line="28" selection-end-column="20" />
89 91 <folding />
90 92 </state>
91 93 </provider>
92 94 </entry>
93 95 </file>
94   - <file leaf-file-name="config.scss" pinned="false" current-in-tab="false">
95   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/config.scss">
  96 + <file leaf-file-name="application_helper.rb" pinned="false" current-in-tab="false">
  97 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
96 98 <provider selected="true" editor-type-id="text-editor">
97   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="135">
98   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  99 + <state vertical-scroll-proportion="0.0" vertical-offset="581" max-vertical-offset="1215">
  100 + <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
99 101 <folding />
100 102 </state>
101 103 </provider>
102 104 </entry>
103 105 </file>
104   - <file leaf-file-name="frontend.css.scss" pinned="false" current-in-tab="false">
105   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
  106 + <file leaf-file-name="pages_helper.rb" pinned="false" current-in-tab="false">
  107 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
106 108 <provider selected="true" editor-type-id="text-editor">
107   - <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
108   - <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
  109 + <state vertical-scroll-proportion="-13.888889" vertical-offset="555" max-vertical-offset="2055">
  110 + <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
109 111 <folding />
110 112 </state>
111 113 </provider>
112 114 </entry>
113 115 </file>
114   - <file leaf-file-name="frontend_extend.css.scss" pinned="false" current-in-tab="false">
115   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
  116 + <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
  117 + <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
116 118 <provider selected="true" editor-type-id="text-editor">
117   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
118   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  119 + <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
  120 + <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
119 121 <folding />
120 122 </state>
121 123 </provider>
122 124 </entry>
123 125 </file>
124   - <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">
125   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  126 + <file leaf-file-name="template_generator.rb" pinned="false" current-in-tab="false">
  127 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
126 128 <provider selected="true" editor-type-id="text-editor">
127   - <state vertical-scroll-proportion="-20.416666" vertical-offset="185" max-vertical-offset="825">
128   - <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
  129 + <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">
  130 + <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
129 131 <folding />
130 132 </state>
131 133 </provider>
... ... @@ -151,7 +153,6 @@
151 153 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb" />
152 154 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js" />
153 155 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
154   - <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
155 156 <option value="$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb" />
156 157 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb" />
157 158 <option value="$PROJECT_DIR$/config/locales/en.yml" />
... ... @@ -186,6 +187,7 @@
186 187 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb" />
187 188 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" />
188 189 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
  190 + <option value="$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb" />
189 191 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
190 192 </list>
191 193 </option>
... ... @@ -221,7 +223,6 @@
221 223 <sortByType />
222 224 </navigator>
223 225 <panes>
224   - <pane id="Scope" />
225 226 <pane id="ProjectPane">
226 227 <subPane>
227 228 <PATH>
... ... @@ -282,89 +283,9 @@
282 283 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
283 284 </PATH_ELEMENT>
284 285 <PATH_ELEMENT>
285   - <option name="myItemId" value="config" />
286   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
287   - </PATH_ELEMENT>
288   - </PATH>
289   - <PATH>
290   - <PATH_ELEMENT>
291   - <option name="myItemId" value="kanjai" />
292   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
293   - </PATH_ELEMENT>
294   - <PATH_ELEMENT>
295   - <option name="myItemId" value="kanjai" />
296   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
297   - </PATH_ELEMENT>
298   - <PATH_ELEMENT>
299   - <option name="myItemId" value="app" />
300   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
301   - </PATH_ELEMENT>
302   - <PATH_ELEMENT>
303   - <option name="myItemId" value="views" />
304   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
305   - </PATH_ELEMENT>
306   - </PATH>
307   - <PATH>
308   - <PATH_ELEMENT>
309   - <option name="myItemId" value="kanjai" />
310   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
311   - </PATH_ELEMENT>
312   - <PATH_ELEMENT>
313   - <option name="myItemId" value="kanjai" />
314   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
315   - </PATH_ELEMENT>
316   - <PATH_ELEMENT>
317   - <option name="myItemId" value="app" />
318   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
319   - </PATH_ELEMENT>
320   - <PATH_ELEMENT>
321   - <option name="myItemId" value="views" />
322   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
323   - </PATH_ELEMENT>
324   - <PATH_ELEMENT>
325   - <option name="myItemId" value="layouts" />
326   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
327   - </PATH_ELEMENT>
328   - <PATH_ELEMENT>
329   - <option name="myItemId" value="kanjai" />
330   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
331   - </PATH_ELEMENT>
332   - </PATH>
333   - <PATH>
334   - <PATH_ELEMENT>
335   - <option name="myItemId" value="kanjai" />
336   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
337   - </PATH_ELEMENT>
338   - <PATH_ELEMENT>
339   - <option name="myItemId" value="kanjai" />
340   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
341   - </PATH_ELEMENT>
342   - <PATH_ELEMENT>
343   - <option name="myItemId" value="app" />
344   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
345   - </PATH_ELEMENT>
346   - </PATH>
347   - <PATH>
348   - <PATH_ELEMENT>
349   - <option name="myItemId" value="kanjai" />
350   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
351   - </PATH_ELEMENT>
352   - <PATH_ELEMENT>
353   - <option name="myItemId" value="kanjai" />
354   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
355   - </PATH_ELEMENT>
356   - <PATH_ELEMENT>
357 286 <option name="myItemId" value="app" />
358 287 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
359 288 </PATH_ELEMENT>
360   - <PATH_ELEMENT>
361   - <option name="myItemId" value="controllers" />
362   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
363   - </PATH_ELEMENT>
364   - <PATH_ELEMENT>
365   - <option name="myItemId" value="kanjai" />
366   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
367   - </PATH_ELEMENT>
368 289 </PATH>
369 290 <PATH>
370 291 <PATH_ELEMENT>
... ... @@ -380,11 +301,7 @@
380 301 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
381 302 </PATH_ELEMENT>
382 303 <PATH_ELEMENT>
383   - <option name="myItemId" value="assets" />
384   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
385   - </PATH_ELEMENT>
386   - <PATH_ELEMENT>
387   - <option name="myItemId" value="stylesheets" />
  304 + <option name="myItemId" value="helpers" />
388 305 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
389 306 </PATH_ELEMENT>
390 307 <PATH_ELEMENT>
... ... @@ -406,11 +323,7 @@
406 323 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
407 324 </PATH_ELEMENT>
408 325 <PATH_ELEMENT>
409   - <option name="myItemId" value="assets" />
410   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
411   - </PATH_ELEMENT>
412   - <PATH_ELEMENT>
413   - <option name="myItemId" value="stylesheets" />
  326 + <option name="myItemId" value="helpers" />
414 327 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
415 328 </PATH_ELEMENT>
416 329 <PATH_ELEMENT>
... ... @@ -422,27 +335,10 @@
422 335 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
423 336 </PATH_ELEMENT>
424 337 </PATH>
425   - <PATH>
426   - <PATH_ELEMENT>
427   - <option name="myItemId" value="kanjai" />
428   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
429   - </PATH_ELEMENT>
430   - <PATH_ELEMENT>
431   - <option name="myItemId" value="kanjai" />
432   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
433   - </PATH_ELEMENT>
434   - <PATH_ELEMENT>
435   - <option name="myItemId" value="app" />
436   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
437   - </PATH_ELEMENT>
438   - <PATH_ELEMENT>
439   - <option name="myItemId" value="assets" />
440   - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
441   - </PATH_ELEMENT>
442   - </PATH>
443 338 </subPane>
444 339 </pane>
445 340 <pane id="RailsProjectView" />
  341 + <pane id="Scope" />
446 342 </panes>
447 343 </component>
448 344 <component name="PropertiesComponent">
... ... @@ -639,20 +535,20 @@
639 535 <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" />
640 536 <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" />
641 537 <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" />
642   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.36914378" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
643   - <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" />
644   - <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" />
  538 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.43861067" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
645 539 <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" />
646 540 <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" />
647 541 <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" />
648 542 <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" />
649 543 <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" />
650   - <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" />
651 544 <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" />
  545 + <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" />
  546 + <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" />
652 547 <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" />
653 548 <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" />
654   - <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" />
  549 + <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" />
655 550 <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" />
  551 + <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" />
656 552 </layout>
657 553 </component>
658 554 <component name="Vcs.Log.UiProperties">
... ... @@ -678,55 +574,6 @@
678 574 <watches-manager />
679 575 </component>
680 576 <component name="editorHistoryManager">
681   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css">
682   - <provider selected="true" editor-type-id="text-editor">
683   - <state vertical-scroll-proportion="0.0" vertical-offset="5441" max-vertical-offset="6075">
684   - <caret line="269" column="36" selection-start-line="269" selection-start-column="36" selection-end-line="269" selection-end-column="36" />
685   - </state>
686   - </provider>
687   - </entry>
688   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/general.js">
689   - <provider selected="true" editor-type-id="text-editor">
690   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="135">
691   - <caret line="2" column="24" selection-start-line="2" selection-start-column="24" selection-end-line="2" selection-end-column="24" />
692   - </state>
693   - </provider>
694   - </entry>
695   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
696   - <provider selected="true" editor-type-id="text-editor">
697   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
698   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
699   - </state>
700   - </provider>
701   - </entry>
702   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
703   - <provider selected="true" editor-type-id="text-editor">
704   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
705   - <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" />
706   - </state>
707   - </provider>
708   - </entry>
709   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
710   - <provider selected="true" editor-type-id="text-editor">
711   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
712   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
713   - </state>
714   - </provider>
715   - </entry>
716   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
717   - <provider selected="true" editor-type-id="text-editor">
718   - <state vertical-scroll-proportion="0.0" vertical-offset="225" max-vertical-offset="7125">
719   - <caret line="15" column="55" selection-start-line="15" selection-start-column="55" selection-end-line="15" selection-end-column="55" />
720   - </state>
721   - </provider>
722   - </entry>
723   - <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
724   - <provider selected="true" editor-type-id="text-editor">
725   - <state vertical-scroll-proportion="0.0" vertical-offset="480" max-vertical-offset="1140">
726   - <caret line="25" column="32" selection-start-line="25" selection-start-column="20" selection-end-line="25" selection-end-column="32" />
727   - </state>
728   - </provider>
729   - </entry>
730 577 <entry file="file://$PROJECT_DIR$/app/models/kanjai/print_template.rb">
731 578 <provider selected="true" editor-type-id="text-editor">
732 579 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -741,13 +588,6 @@
741 588 </state>
742 589 </provider>
743 590 </entry>
744   - <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
745   - <provider selected="true" editor-type-id="text-editor">
746   - <state vertical-scroll-proportion="0.0" vertical-offset="2400" max-vertical-offset="4635">
747   - <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
748   - </state>
749   - </provider>
750   - </entry>
751 591 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_form.html.erb">
752 592 <provider selected="true" editor-type-id="text-editor">
753 593 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="615">
... ... @@ -755,20 +595,6 @@
755 595 </state>
756 596 </provider>
757 597 </entry>
758   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
759   - <provider selected="true" editor-type-id="text-editor">
760   - <state vertical-scroll-proportion="0.0" vertical-offset="720" max-vertical-offset="1380">
761   - <caret line="48" column="94" selection-start-line="48" selection-start-column="78" selection-end-line="48" selection-end-column="94" />
762   - </state>
763   - </provider>
764   - </entry>
765   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
766   - <provider selected="true" editor-type-id="text-editor">
767   - <state vertical-scroll-proportion="0.0" vertical-offset="581" max-vertical-offset="1215">
768   - <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
769   - </state>
770   - </provider>
771   - </entry>
772 598 <entry file="file://$PROJECT_DIR$/app/views/devise/confirmations/new.html.erb">
773 599 <provider selected="true" editor-type-id="text-editor">
774 600 <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="375">
... ... @@ -790,13 +616,6 @@
790 616 </state>
791 617 </provider>
792 618 </entry>
793   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
794   - <provider selected="true" editor-type-id="text-editor">
795   - <state vertical-scroll-proportion="-5.75" vertical-offset="72" max-vertical-offset="615">
796   - <caret line="14" column="30" selection-start-line="14" selection-start-column="30" selection-end-line="14" selection-end-column="30" />
797   - </state>
798   - </provider>
799   - </entry>
800 619 <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
801 620 <provider selected="true" editor-type-id="text-editor">
802 621 <state vertical-scroll-proportion="0.45918366" vertical-offset="135" max-vertical-offset="660">
... ... @@ -832,13 +651,6 @@
832 651 </state>
833 652 </provider>
834 653 </entry>
835   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
836   - <provider selected="true" editor-type-id="text-editor">
837   - <state vertical-scroll-proportion="0.0" vertical-offset="1755" max-vertical-offset="8550">
838   - <caret line="146" column="33" selection-start-line="146" selection-start-column="33" selection-end-line="146" selection-end-column="33" />
839   - </state>
840   - </provider>
841   - </entry>
842 654 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js">
843 655 <provider selected="true" editor-type-id="text-editor">
844 656 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="5745">
... ... @@ -867,13 +679,6 @@
867 679 </state>
868 680 </provider>
869 681 </entry>
870   - <entry file="file://$PROJECT_DIR$/config/routes.rb">
871   - <provider selected="true" editor-type-id="text-editor">
872   - <state vertical-scroll-proportion="0.0" vertical-offset="281" max-vertical-offset="960">
873   - <caret line="30" column="9" selection-start-line="30" selection-start-column="9" selection-end-line="30" selection-end-column="9" />
874   - </state>
875   - </provider>
876   - </entry>
877 682 <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
878 683 <provider selected="true" editor-type-id="text-editor">
879 684 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
... ... @@ -913,7 +718,6 @@
913 718 <provider selected="true" editor-type-id="text-editor">
914 719 <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="735">
915 720 <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
916   - <folding />
917 721 </state>
918 722 </provider>
919 723 </entry>
... ... @@ -921,7 +725,6 @@
921 725 <provider selected="true" editor-type-id="text-editor">
922 726 <state vertical-scroll-proportion="0.0" vertical-offset="807" max-vertical-offset="22110">
923 727 <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
924   - <folding />
925 728 </state>
926 729 </provider>
927 730 </entry>
... ... @@ -929,7 +732,6 @@
929 732 <provider selected="true" editor-type-id="text-editor">
930 733 <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="315">
931 734 <caret line="0" column="42" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="42" />
932   - <folding />
933 735 </state>
934 736 </provider>
935 737 </entry>
... ... @@ -937,10 +739,6 @@
937 739 <provider selected="true" editor-type-id="text-editor">
938 740 <state vertical-scroll-proportion="0.0" vertical-offset="1778" max-vertical-offset="4635">
939 741 <caret line="148" column="12" selection-start-line="148" selection-start-column="6" selection-end-line="148" selection-end-column="12" />
940   - <folding>
941   - <element signature="e#2689#2725#0" expanded="false" />
942   - <element signature="e#2768#2808#0" expanded="false" />
943   - </folding>
944 742 </state>
945 743 </provider>
946 744 </entry>
... ... @@ -948,7 +746,6 @@
948 746 <provider selected="true" editor-type-id="text-editor">
949 747 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
950 748 <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
951   - <folding />
952 749 </state>
953 750 </provider>
954 751 </entry>
... ... @@ -956,7 +753,6 @@
956 753 <provider selected="true" editor-type-id="text-editor">
957 754 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
958 755 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
959   - <folding />
960 756 </state>
961 757 </provider>
962 758 </entry>
... ... @@ -964,81 +760,150 @@
964 760 <provider selected="true" editor-type-id="text-editor">
965 761 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
966 762 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
967   - <folding />
968 763 </state>
969 764 </provider>
970 765 </entry>
971   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  766 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
972 767 <provider selected="true" editor-type-id="text-editor">
973   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="2685">
974   - <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
975   - <folding />
  768 + <state vertical-scroll-proportion="0.0" vertical-offset="2919" max-vertical-offset="7845">
  769 + <caret line="210" column="0" selection-start-line="210" selection-start-column="0" selection-end-line="210" selection-end-column="0" />
976 770 </state>
977 771 </provider>
978 772 </entry>
979   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
  773 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
980 774 <provider selected="true" editor-type-id="text-editor">
981   - <state vertical-scroll-proportion="5.4344263" vertical-offset="0" max-vertical-offset="3420">
982   - <caret line="221" column="18" selection-start-line="221" selection-start-column="18" selection-end-line="221" selection-end-column="18" />
983   - <folding />
  775 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  776 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
984 777 </state>
985 778 </provider>
986 779 </entry>
987   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
  780 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
988 781 <provider selected="true" editor-type-id="text-editor">
989   - <state vertical-scroll-proportion="0.0" vertical-offset="2919" max-vertical-offset="7845">
990   - <caret line="210" column="0" selection-start-line="210" selection-start-column="0" selection-end-line="210" selection-end-column="0" />
991   - <folding>
992   - <marker date="1470342771000" expanded="true" signature="1842:1884" placeholder="..." />
993   - <marker date="1470342771000" expanded="true" signature="4090:4108" placeholder="..." />
994   - <marker date="1470342771000" expanded="true" signature="4122:4140" placeholder="..." />
995   - <marker date="1470342771000" expanded="true" signature="4192:4202" placeholder="..." />
996   - <marker date="1470342771000" expanded="true" signature="4229:4292" placeholder="..." />
997   - </folding>
  782 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  783 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
998 784 </state>
999 785 </provider>
1000 786 </entry>
1001   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/config.scss">
  787 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  788 + <provider selected="true" editor-type-id="text-editor">
  789 + <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
  790 + <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
  791 + </state>
  792 + </provider>
  793 + </entry>
  794 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin_extend.css.scss">
1002 795 <provider selected="true" editor-type-id="text-editor">
1003 796 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1004 797 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1005   - <folding />
  798 + </state>
  799 + </provider>
  800 + </entry>
  801 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
  802 + <provider selected="true" editor-type-id="text-editor">
  803 + <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="390">
  804 + <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
  805 + </state>
  806 + </provider>
  807 + </entry>
  808 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  809 + <provider selected="true" editor-type-id="text-editor">
  810 + <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="2685">
  811 + <caret line="34" column="95" selection-start-line="34" selection-start-column="12" selection-end-line="34" selection-end-column="95" />
  812 + </state>
  813 + </provider>
  814 + </entry>
  815 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/bootstrap.css.scss.erb">
  816 + <provider selected="true" editor-type-id="text-editor">
  817 + <state vertical-scroll-proportion="0.0" vertical-offset="3765" max-vertical-offset="95070">
  818 + <caret line="269" column="26" selection-start-line="269" selection-start-column="16" selection-end-line="269" selection-end-column="26" />
1006 819 </state>
1007 820 </provider>
1008 821 </entry>
1009 822 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
1010 823 <provider selected="true" editor-type-id="text-editor">
1011   - <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
  824 + <state vertical-scroll-proportion="0.0" vertical-offset="255" max-vertical-offset="360">
1012 825 <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
1013   - <folding />
1014 826 </state>
1015 827 </provider>
1016 828 </entry>
1017   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
  829 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/applets.scss">
1018 830 <provider selected="true" editor-type-id="text-editor">
1019 831 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1020 832 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
1021   - <folding />
1022 833 </state>
1023 834 </provider>
1024 835 </entry>
1025   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
  836 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/config.scss">
1026 837 <provider selected="true" editor-type-id="text-editor">
1027 838 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1028 839 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  840 + </state>
  841 + </provider>
  842 + </entry>
  843 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/bootstrap.js">
  844 + <provider selected="true" editor-type-id="text-editor">
  845 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="34905">
  846 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  847 + </state>
  848 + </provider>
  849 + </entry>
  850 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
  851 + <provider selected="true" editor-type-id="text-editor">
  852 + <state vertical-scroll-proportion="0.0" vertical-offset="1366" max-vertical-offset="3420">
  853 + <caret line="103" column="30" selection-start-line="103" selection-start-column="17" selection-end-line="103" selection-end-column="30" />
1029 854 <folding />
1030 855 </state>
1031 856 </provider>
1032 857 </entry>
1033   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  858 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb">
1034 859 <provider selected="true" editor-type-id="text-editor">
1035   - <state vertical-scroll-proportion="-20.416666" vertical-offset="185" max-vertical-offset="825">
1036   - <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
  860 + <state vertical-scroll-proportion="0.0" vertical-offset="585" max-vertical-offset="1380">
  861 + <caret line="56" column="10" selection-start-line="56" selection-start-column="10" selection-end-line="56" selection-end-column="10" />
1037 862 <folding />
1038 863 </state>
1039 864 </provider>
1040 865 </entry>
1041   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin_extend.css.scss">
  866 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
  867 + <provider selected="true" editor-type-id="text-editor">
  868 + <state vertical-scroll-proportion="0.0" vertical-offset="75" max-vertical-offset="675">
  869 + <caret line="5" column="132" selection-start-line="5" selection-start-column="43" selection-end-line="5" selection-end-column="132" />
  870 + <folding>
  871 + <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
  872 + </folding>
  873 + </state>
  874 + </provider>
  875 + </entry>
  876 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
  877 + <provider selected="true" editor-type-id="text-editor">
  878 + <state vertical-scroll-proportion="0.0" vertical-offset="353" max-vertical-offset="960">
  879 + <caret line="49" column="26" selection-start-line="0" selection-start-column="0" selection-end-line="58" selection-end-column="0" />
  880 + <folding />
  881 + </state>
  882 + </provider>
  883 + </entry>
  884 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
  885 + <provider selected="true" editor-type-id="text-editor">
  886 + <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="615">
  887 + <caret line="24" column="16" selection-start-line="0" selection-start-column="0" selection-end-line="35" selection-end-column="9" />
  888 + <folding>
  889 + <element signature="e#360#414#0#ruby" expanded="false" />
  890 + <element signature="e#1122#1141#0#ruby" expanded="false" />
  891 + <element signature="e#1197#1216#0#ruby" expanded="false" />
  892 + </folding>
  893 + </state>
  894 + </provider>
  895 + </entry>
  896 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/html_generator.js">
  897 + <provider selected="true" editor-type-id="text-editor">
  898 + <state vertical-scroll-proportion="0.0" vertical-offset="3188" max-vertical-offset="8550">
  899 + <caret line="226" column="0" selection-start-line="226" selection-start-column="0" selection-end-line="232" selection-end-column="7" />
  900 + <folding>
  901 + <marker date="1470228118000" expanded="true" signature="503:515" placeholder="..." />
  902 + </folding>
  903 + </state>
  904 + </provider>
  905 + </entry>
  906 + <entry file="file://$PROJECT_DIR$/Gemfile">
1042 907 <provider selected="true" editor-type-id="text-editor">
1043 908 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
1044 909 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
... ... @@ -1046,10 +911,34 @@
1046 911 </state>
1047 912 </provider>
1048 913 </entry>
1049   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
  914 + <entry file="file://$PROJECT_DIR$/kanjai.gemspec">
1050 915 <provider selected="true" editor-type-id="text-editor">
1051   - <state vertical-scroll-proportion="-0.625" vertical-offset="0" max-vertical-offset="390">
1052   - <caret line="1" column="37" selection-start-line="1" selection-start-column="37" selection-end-line="1" selection-end-column="37" />
  916 + <state vertical-scroll-proportion="0.0" vertical-offset="218" max-vertical-offset="1140">
  917 + <caret line="28" column="20" selection-start-line="28" selection-start-column="18" selection-end-line="28" selection-end-column="20" />
  918 + <folding />
  919 + </state>
  920 + </provider>
  921 + </entry>
  922 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
  923 + <provider selected="true" editor-type-id="text-editor">
  924 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
  925 + <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
  926 + <folding />
  927 + </state>
  928 + </provider>
  929 + </entry>
  930 + <entry file="file://$PROJECT_DIR$/lib/kanjai/template_generator.rb">
  931 + <provider selected="true" editor-type-id="text-editor">
  932 + <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">
  933 + <caret line="180" column="39" selection-start-line="180" selection-start-column="39" selection-end-line="180" selection-end-column="39" />
  934 + <folding />
  935 + </state>
  936 + </provider>
  937 + </entry>
  938 + <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
  939 + <provider selected="true" editor-type-id="text-editor">
  940 + <state vertical-scroll-proportion="-13.888889" vertical-offset="555" max-vertical-offset="2055">
  941 + <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
1053 942 <folding />
1054 943 </state>
1055 944 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.57)
  4 + kanjai (0.0.58)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -61,15 +61,15 @@ GEM
61 61 tzinfo (~> 1.1)
62 62 acts_as_list (0.7.5)
63 63 activerecord (>= 3.0)
64   - acts_as_tree (2.4.0)
  64 + acts_as_tree (2.5.0)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.5.1)
68   - aws-sdk-resources (= 2.5.1)
69   - aws-sdk-core (2.5.1)
  67 + aws-sdk (2.5.3)
  68 + aws-sdk-resources (= 2.5.3)
  69 + aws-sdk-core (2.5.3)
70 70 jmespath (~> 1.0)
71   - aws-sdk-resources (2.5.1)
72   - aws-sdk-core (= 2.5.1)
  71 + aws-sdk-resources (2.5.3)
  72 + aws-sdk-core (= 2.5.3)
73 73 backport_new_renderer (1.0.0)
74 74 rails
75 75 bcrypt (3.1.11)
... ...
... ... @@ -16,7 +16,7 @@ module Kanjai
16 16 if client_view == false and row['attributes']['type'] == 'block'
17 17 html_attributes['data-id'] = row['attributes']['id']
18 18 page_content = page_data.page_contents.where(:structure_id => row['attributes']['id']).first
19   - row_html = page_content.nil? ? '11' : page_content.get_content
  19 + row_html = page_content.nil? ? '' : page_content.get_content
20 20 end
21 21
22 22 html += ActionController::Base.helpers.content_tag(:div, '', html_attributes) do
... ... @@ -63,7 +63,7 @@ module Kanjai
63 63 end
64 64
65 65 else
66   - class_name = 'row'
  66 + class_name = 'row-fluid'
67 67 html_attributes = {}
68 68 html_attributes[:class] = class_name
69 69
... ...
1 1 module Kanjai
2   - VERSION = "0.0.58"
  2 + VERSION = "0.0.59"
3 3 end
... ...