EDIT / kanjai · Commits

Commit 99dfc8adf9db652152c025fde83fc0180e6f8e10

Authored by Karpikau Andrei
1 parent e23f133d

add extend css file for admin part

Inline Side-by-side
Showing 6 changed files with 284 additions and 165 deletions
... ... @@ -134,17 +134,17 @@
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 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.4.0, 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" />
138 138 <orderEntry type="library" scope="PROVIDED" name="arel (v6.0.3, rbenv: 2.1.3) [gem]" level="application" />
139   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.4.3, rbenv: 2.1.3) [gem]" level="application" />
140   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.4.3, rbenv: 2.1.3) [gem]" level="application" />
141   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.4.3, rbenv: 2.1.3) [gem]" level="application" />
  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" />
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" />
145 145 <orderEntry type="library" scope="PROVIDED" name="bundler (v1.9.0, rbenv: 2.1.3) [gem]" level="application" />
146 146 <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.0.2, rbenv: 2.1.3) [gem]" level="application" />
147   - <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.3, rbenv: 2.1.3) [gem]" level="application" />
  147 + <orderEntry type="library" scope="PROVIDED" name="daemons (v1.2.4, rbenv: 2.1.3) [gem]" level="application" />
148 148 <orderEntry type="library" scope="PROVIDED" name="delayed_job (v4.1.2, rbenv: 2.1.3) [gem]" level="application" />
149 149 <orderEntry type="library" scope="PROVIDED" name="delayed_job_active_record (v4.1.1, rbenv: 2.1.3) [gem]" level="application" />
150 150 <orderEntry type="library" scope="PROVIDED" name="devise (v4.2.0, 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.0, 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" />
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">
... ...
... ... @@ -35,11 +35,21 @@
35 35 </provider>
36 36 </entry>
37 37 </file>
38   - <file leaf-file-name="page.rb" pinned="false" current-in-tab="false">
39   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page.rb">
  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 40 <provider selected="true" editor-type-id="text-editor">
41   - <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="1485">
42   - <caret line="25" column="27" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="27" />
  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 />
  44 + </state>
  45 + </provider>
  46 + </entry>
  47 + </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">
  50 + <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" />
43 53 <folding />
44 54 </state>
45 55 </provider>
... ... @@ -61,77 +71,61 @@
61 71 </provider>
62 72 </entry>
63 73 </file>
64   - <file leaf-file-name="jquery.fileupload.js" pinned="false" current-in-tab="false">
65   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js">
  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">
66 76 <provider selected="true" editor-type-id="text-editor">
67   - <state vertical-scroll-proportion="0.0" vertical-offset="807" max-vertical-offset="22110">
68   - <caret line="72" column="33" selection-start-line="72" selection-start-column="33" selection-end-line="72" selection-end-column="33" />
  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" />
69 79 <folding />
70 80 </state>
71 81 </provider>
72 82 </entry>
73 83 </file>
74   - <file leaf-file-name="gallery.html.erb" pinned="false" current-in-tab="false">
75   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/gallery.html.erb">
76   - <provider selected="true" editor-type-id="text-editor">
77   - <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="735">
78   - <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
79   - <folding>
80   - <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
81   - <element signature="n#t('drop_your_file')#0;n#!!top" expanded="false" />
82   - </folding>
83   - </state>
84   - </provider>
85   - </entry>
86   - </file>
87   - <file leaf-file-name="_preview.html.erb" pinned="false" current-in-tab="false">
88   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
  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">
89 86 <provider selected="true" editor-type-id="text-editor">
90   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
91   - <caret line="0" column="42" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="42" />
  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" />
92 89 <folding />
93 90 </state>
94 91 </provider>
95 92 </entry>
96 93 </file>
97   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
98   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  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">
99 96 <provider selected="true" editor-type-id="text-editor">
100   - <state vertical-scroll-proportion="0.0" vertical-offset="1778" max-vertical-offset="4635">
101   - <caret line="148" column="12" selection-start-line="148" selection-start-column="6" selection-end-line="148" selection-end-column="12" />
102   - <folding>
103   - <element signature="e#2689#2725#0" expanded="false" />
104   - <element signature="e#2768#2808#0" expanded="false" />
105   - </folding>
  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 + <folding />
106 100 </state>
107 101 </provider>
108 102 </entry>
109 103 </file>
110   - <file leaf-file-name="delete_gallery_image.js.erb" pinned="false" current-in-tab="false">
111   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb">
  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">
112 106 <provider selected="true" editor-type-id="text-editor">
113   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
114   - <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
  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" />
115 109 <folding />
116 110 </state>
117 111 </provider>
118 112 </entry>
119 113 </file>
120   - <file leaf-file-name="update_gallery.js.erb" pinned="false" current-in-tab="false">
121   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/update_gallery.js.erb">
  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">
122 116 <provider selected="true" editor-type-id="text-editor">
123   - <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="135">
124   - <caret line="1" column="61" selection-start-line="1" selection-start-column="61" selection-end-line="1" selection-end-column="61" />
  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" />
125 119 <folding />
126 120 </state>
127 121 </provider>
128 122 </entry>
129 123 </file>
130   - <file leaf-file-name="_gallery_exist_images.html.erb" pinned="false" current-in-tab="false">
131   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_gallery_exist_images.html.erb">
  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">
132 126 <provider selected="true" editor-type-id="text-editor">
133   - <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="210">
134   - <caret line="8" column="9" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
  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" />
135 129 <folding />
136 130 </state>
137 131 </provider>
... ... @@ -170,7 +164,6 @@
170 164 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
171 165 <option value="$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb" />
172 166 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/general_admin.js" />
173   - <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
174 167 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css" />
175 168 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss" />
176 169 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js" />
... ... @@ -192,6 +185,7 @@
192 185 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js" />
193 186 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb" />
194 187 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb" />
  188 + <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss" />
195 189 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
196 190 </list>
197 191 </option>
... ... @@ -228,7 +222,6 @@
228 222 </navigator>
229 223 <panes>
230 224 <pane id="Scope" />
231   - <pane id="RailsProjectView" />
232 225 <pane id="ProjectPane">
233 226 <subPane>
234 227 <PATH>
... ... @@ -306,6 +299,128 @@
306 299 <option name="myItemId" value="app" />
307 300 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
308 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 + <option name="myItemId" value="app" />
  358 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  359 + </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 + </PATH>
  369 + <PATH>
  370 + <PATH_ELEMENT>
  371 + <option name="myItemId" value="kanjai" />
  372 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  373 + </PATH_ELEMENT>
  374 + <PATH_ELEMENT>
  375 + <option name="myItemId" value="kanjai" />
  376 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  377 + </PATH_ELEMENT>
  378 + <PATH_ELEMENT>
  379 + <option name="myItemId" value="app" />
  380 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  381 + </PATH_ELEMENT>
  382 + <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" />
  388 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  389 + </PATH_ELEMENT>
  390 + <PATH_ELEMENT>
  391 + <option name="myItemId" value="kanjai" />
  392 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  393 + </PATH_ELEMENT>
  394 + </PATH>
  395 + <PATH>
  396 + <PATH_ELEMENT>
  397 + <option name="myItemId" value="kanjai" />
  398 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  399 + </PATH_ELEMENT>
  400 + <PATH_ELEMENT>
  401 + <option name="myItemId" value="kanjai" />
  402 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  403 + </PATH_ELEMENT>
  404 + <PATH_ELEMENT>
  405 + <option name="myItemId" value="app" />
  406 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  407 + </PATH_ELEMENT>
  408 + <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" />
  414 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  415 + </PATH_ELEMENT>
  416 + <PATH_ELEMENT>
  417 + <option name="myItemId" value="kanjai" />
  418 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  419 + </PATH_ELEMENT>
  420 + <PATH_ELEMENT>
  421 + <option name="myItemId" value="admin" />
  422 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  423 + </PATH_ELEMENT>
309 424 </PATH>
310 425 <PATH>
311 426 <PATH_ELEMENT>
... ... @@ -327,6 +442,7 @@
327 442 </PATH>
328 443 </subPane>
329 444 </pane>
  445 + <pane id="RailsProjectView" />
330 446 </panes>
331 447 </component>
332 448 <component name="PropertiesComponent">
... ... @@ -523,7 +639,9 @@
523 639 <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" />
524 640 <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" />
525 641 <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" />
526   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.35218093" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  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" />
527 645 <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" />
528 646 <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" />
529 647 <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" />
... ... @@ -531,12 +649,10 @@
531 649 <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" />
532 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" />
533 651 <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" />
534   - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
535 652 <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" />
536 653 <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" />
537 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" />
538 655 <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
539   - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
540 656 </layout>
541 657 </component>
542 658 <component name="Vcs.Log.UiProperties">
... ... @@ -562,55 +678,6 @@
562 678 <watches-manager />
563 679 </component>
564 680 <component name="editorHistoryManager">
565   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_operation.html.erb">
566   - <provider selected="true" editor-type-id="text-editor">
567   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
568   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
569   - </state>
570   - </provider>
571   - </entry>
572   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/structure.html.erb">
573   - <provider selected="true" editor-type-id="text-editor">
574   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="675">
575   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
576   - </state>
577   - </provider>
578   - </entry>
579   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb">
580   - <provider selected="true" editor-type-id="text-editor">
581   - <state vertical-scroll-proportion="0.0" vertical-offset="378" max-vertical-offset="1035">
582   - <caret line="32" column="24" selection-start-line="32" selection-start-column="6" selection-end-line="32" selection-end-column="24" />
583   - </state>
584   - </provider>
585   - </entry>
586   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_extend.js">
587   - <provider selected="true" editor-type-id="text-editor">
588   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
589   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
590   - </state>
591   - </provider>
592   - </entry>
593   - <entry file="file://$PROJECT_DIR$/config/initializers/aws.rb">
594   - <provider selected="true" editor-type-id="text-editor">
595   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="180">
596   - <caret line="5" column="58" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="58" />
597   - </state>
598   - </provider>
599   - </entry>
600   - <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_content_marker.rb">
601   - <provider selected="true" editor-type-id="text-editor">
602   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="585">
603   - <caret line="29" column="52" selection-start-line="29" selection-start-column="52" selection-end-line="29" selection-end-column="52" />
604   - </state>
605   - </provider>
606   - </entry>
607   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
608   - <provider selected="true" editor-type-id="text-editor">
609   - <state vertical-scroll-proportion="0.0" vertical-offset="285" max-vertical-offset="375">
610   - <caret line="19" column="28" selection-start-line="19" selection-start-column="28" selection-end-line="19" selection-end-column="28" />
611   - </state>
612   - </provider>
613   - </entry>
614 681 <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/fileinput.css">
615 682 <provider selected="true" editor-type-id="text-editor">
616 683 <state vertical-scroll-proportion="0.0" vertical-offset="5441" max-vertical-offset="6075">
... ... @@ -632,13 +699,6 @@
632 699 </state>
633 700 </provider>
634 701 </entry>
635   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
636   - <provider selected="true" editor-type-id="text-editor">
637   - <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
638   - <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
639   - </state>
640   - </provider>
641   - </entry>
642 702 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend.js">
643 703 <provider selected="true" editor-type-id="text-editor">
644 704 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="555">
... ... @@ -646,13 +706,6 @@
646 706 </state>
647 707 </provider>
648 708 </entry>
649   - <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
650   - <provider selected="true" editor-type-id="text-editor">
651   - <state vertical-scroll-proportion="0.0" vertical-offset="185" max-vertical-offset="825">
652   - <caret line="44" column="52" selection-start-line="44" selection-start-column="52" selection-end-line="44" selection-end-column="52" />
653   - </state>
654   - </provider>
655   - </entry>
656 709 <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb">
657 710 <provider selected="true" editor-type-id="text-editor">
658 711 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
... ... @@ -723,13 +776,6 @@
723 776 </state>
724 777 </provider>
725 778 </entry>
726   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
727   - <provider selected="true" editor-type-id="text-editor">
728   - <state vertical-scroll-proportion="0.0" vertical-offset="510" max-vertical-offset="2685">
729   - <caret line="63" column="0" selection-start-line="63" selection-start-column="0" selection-end-line="63" selection-end-column="0" />
730   - </state>
731   - </provider>
732   - </entry>
733 779 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/lib/fileinput.js">
734 780 <provider selected="true" editor-type-id="text-editor">
735 781 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="49005">
... ... @@ -790,7 +836,6 @@
790 836 <provider selected="true" editor-type-id="text-editor">
791 837 <state vertical-scroll-proportion="0.0" vertical-offset="1755" max-vertical-offset="8550">
792 838 <caret line="146" column="33" selection-start-line="146" selection-start-column="33" selection-end-line="146" selection-end-column="33" />
793   - <folding />
794 839 </state>
795 840 </provider>
796 841 </entry>
... ... @@ -798,7 +843,6 @@
798 843 <provider selected="true" editor-type-id="text-editor">
799 844 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="5745">
800 845 <caret line="280" column="0" selection-start-line="280" selection-start-column="0" selection-end-line="280" selection-end-column="0" />
801   - <folding />
802 846 </state>
803 847 </provider>
804 848 </entry>
... ... @@ -830,18 +874,10 @@
830 874 </state>
831 875 </provider>
832 876 </entry>
833   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
834   - <provider selected="true" editor-type-id="text-editor">
835   - <state vertical-scroll-proportion="-24.166666" vertical-offset="2735" max-vertical-offset="3420">
836   - <caret line="221" column="18" selection-start-line="221" selection-start-column="18" selection-end-line="221" selection-end-column="18" />
837   - </state>
838   - </provider>
839   - </entry>
840 877 <entry file="file://$PROJECT_DIR$/app/models/kanjai/image.rb">
841 878 <provider selected="true" editor-type-id="text-editor">
842 879 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="315">
843 880 <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
844   - <folding />
845 881 </state>
846 882 </provider>
847 883 </entry>
... ... @@ -856,7 +892,6 @@
856 892 <provider selected="true" editor-type-id="text-editor">
857 893 <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="1485">
858 894 <caret line="25" column="27" selection-start-line="25" selection-start-column="8" selection-end-line="25" selection-end-column="27" />
859   - <folding />
860 895 </state>
861 896 </provider>
862 897 </entry>
... ... @@ -864,7 +899,6 @@
864 899 <provider selected="true" editor-type-id="text-editor">
865 900 <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="210">
866 901 <caret line="8" column="9" selection-start-line="8" selection-start-column="9" selection-end-line="8" selection-end-column="9" />
867   - <folding />
868 902 </state>
869 903 </provider>
870 904 </entry>
... ... @@ -872,7 +906,6 @@
872 906 <provider selected="true" editor-type-id="text-editor">
873 907 <state vertical-scroll-proportion="0.0" vertical-offset="15" max-vertical-offset="135">
874 908 <caret line="1" column="61" selection-start-line="1" selection-start-column="61" selection-end-line="1" selection-end-column="61" />
875   - <folding />
876 909 </state>
877 910 </provider>
878 911 </entry>
... ... @@ -880,10 +913,7 @@
880 913 <provider selected="true" editor-type-id="text-editor">
881 914 <state vertical-scroll-proportion="0.0" vertical-offset="120" max-vertical-offset="735">
882 915 <caret line="8" column="20" selection-start-line="8" selection-start-column="20" selection-end-line="8" selection-end-column="20" />
883   - <folding>
884   - <element signature="n#t('admin.pages.edit_page')#0;n#!!top" expanded="false" />
885   - <element signature="n#t('drop_your_file')#0;n#!!top" expanded="false" />
886   - </folding>
  916 + <folding />
887 917 </state>
888 918 </provider>
889 919 </entry>
... ... @@ -895,6 +925,65 @@
895 925 </state>
896 926 </provider>
897 927 </entry>
  928 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
  929 + <provider selected="true" editor-type-id="text-editor">
  930 + <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="315">
  931 + <caret line="0" column="42" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="42" />
  932 + <folding />
  933 + </state>
  934 + </provider>
  935 + </entry>
  936 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  937 + <provider selected="true" editor-type-id="text-editor">
  938 + <state vertical-scroll-proportion="0.0" vertical-offset="1778" max-vertical-offset="4635">
  939 + <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 + </state>
  945 + </provider>
  946 + </entry>
  947 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb">
  948 + <provider selected="true" editor-type-id="text-editor">
  949 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
  950 + <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
  951 + <folding />
  952 + </state>
  953 + </provider>
  954 + </entry>
  955 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
  956 + <provider selected="true" editor-type-id="text-editor">
  957 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  958 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  959 + <folding />
  960 + </state>
  961 + </provider>
  962 + </entry>
  963 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin_controller.rb">
  964 + <provider selected="true" editor-type-id="text-editor">
  965 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  966 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  967 + <folding />
  968 + </state>
  969 + </provider>
  970 + </entry>
  971 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  972 + <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 />
  976 + </state>
  977 + </provider>
  978 + </entry>
  979 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss">
  980 + <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 />
  984 + </state>
  985 + </provider>
  986 + </entry>
898 987 <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin.js">
899 988 <provider selected="true" editor-type-id="text-editor">
900 989 <state vertical-scroll-proportion="0.0" vertical-offset="2919" max-vertical-offset="7845">
... ... @@ -909,29 +998,58 @@
909 998 </state>
910 999 </provider>
911 1000 </entry>
912   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/_preview.html.erb">
  1001 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/config.scss">
913 1002 <provider selected="true" editor-type-id="text-editor">
914   - <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="315">
915   - <caret line="0" column="42" selection-start-line="0" selection-start-column="28" selection-end-line="0" selection-end-column="42" />
  1003 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1004 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
916 1005 <folding />
917 1006 </state>
918 1007 </provider>
919 1008 </entry>
920   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb">
  1009 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend.css.scss">
921 1010 <provider selected="true" editor-type-id="text-editor">
922   - <state vertical-scroll-proportion="0.0" vertical-offset="1778" max-vertical-offset="4635">
923   - <caret line="148" column="12" selection-start-line="148" selection-start-column="6" selection-end-line="148" selection-end-column="12" />
924   - <folding>
925   - <element signature="e#2689#2725#0" expanded="false" />
926   - <element signature="e#2768#2808#0" expanded="false" />
927   - </folding>
  1011 + <state vertical-scroll-proportion="-10.625" vertical-offset="0" max-vertical-offset="360">
  1012 + <caret line="17" column="28" selection-start-line="17" selection-start-column="28" selection-end-line="17" selection-end-column="28" />
  1013 + <folding />
928 1014 </state>
929 1015 </provider>
930 1016 </entry>
931   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/delete_gallery_image.js.erb">
  1017 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/frontend_extend.css.scss">
932 1018 <provider selected="true" editor-type-id="text-editor">
933   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="90">
934   - <caret line="0" column="46" selection-start-line="0" selection-start-column="46" selection-end-line="0" selection-end-column="46" />
  1019 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1020 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1021 + <folding />
  1022 + </state>
  1023 + </provider>
  1024 + </entry>
  1025 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/application.html.erb">
  1026 + <provider selected="true" editor-type-id="text-editor">
  1027 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1028 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1029 + <folding />
  1030 + </state>
  1031 + </provider>
  1032 + </entry>
  1033 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
  1034 + <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" />
  1037 + <folding />
  1038 + </state>
  1039 + </provider>
  1040 + </entry>
  1041 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin_extend.css.scss">
  1042 + <provider selected="true" editor-type-id="text-editor">
  1043 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  1044 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1045 + <folding />
  1046 + </state>
  1047 + </provider>
  1048 + </entry>
  1049 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/general_admin.css.scss">
  1050 + <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" />
935 1053 <folding />
936 1054 </state>
937 1055 </provider>
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.56)
  4 + kanjai (0.0.57)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -64,18 +64,18 @@ GEM
64 64 acts_as_tree (2.4.0)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.4.3)
68   - aws-sdk-resources (= 2.4.3)
69   - aws-sdk-core (2.4.3)
  67 + aws-sdk (2.5.1)
  68 + aws-sdk-resources (= 2.5.1)
  69 + aws-sdk-core (2.5.1)
70 70 jmespath (~> 1.0)
71   - aws-sdk-resources (2.4.3)
72   - aws-sdk-core (= 2.4.3)
  71 + aws-sdk-resources (2.5.1)
  72 + aws-sdk-core (= 2.5.1)
73 73 backport_new_renderer (1.0.0)
74 74 rails
75 75 bcrypt (3.1.11)
76 76 builder (3.2.2)
77 77 concurrent-ruby (1.0.2)
78   - daemons (1.2.3)
  78 + daemons (1.2.4)
79 79 delayed_job (4.1.2)
80 80 activesupport (>= 3.0, < 5.1)
81 81 delayed_job_active_record (4.1.1)
... ... @@ -201,7 +201,7 @@ GEM
201 201 tilt (2.0.5)
202 202 tzinfo (1.2.2)
203 203 thread_safe (~> 0.1)
204   - uglifier (3.0.0)
  204 + uglifier (3.0.1)
205 205 execjs (>= 0.3.0, < 3)
206 206 warden (1.2.6)
207 207 rack (>= 1.0)
... ...
1 1 //= require kanjai/admin/admin
  2 +//= require kanjai/admin/admin_extend
2 3
3 4 //= require kanjai/font_awesome_4_4/font-awesome
4 5
... ...
1 1 module Kanjai
2   - VERSION = "0.0.57"
  2 + VERSION = "0.0.58"
3 3 end
... ...