EDIT / kanjai · Commits

Commit 98002b20319c9ee9940ea6550513d24c261c0989

Authored by Karpikau Andrei
1 parent c4e4e2c3

show admin users

Inline Side-by-side
Showing 12 changed files with 508 additions and 135 deletions
... ... @@ -136,9 +136,10 @@
136 136 <orderEntry type="library" scope="PROVIDED" name="acts_as_list (v0.8.2, rbenv: 2.1.3) [gem]" level="application" />
137 137 <orderEntry type="library" scope="PROVIDED" name="acts_as_tree (v2.6.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.6.18, rbenv: 2.1.3) [gem]" level="application" />
140   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.18, rbenv: 2.1.3) [gem]" level="application" />
141   - <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.18, rbenv: 2.1.3) [gem]" level="application" />
  139 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk (v2.6.23, rbenv: 2.1.3) [gem]" level="application" />
  140 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-core (v2.6.23, rbenv: 2.1.3) [gem]" level="application" />
  141 + <orderEntry type="library" scope="PROVIDED" name="aws-sdk-resources (v2.6.23, rbenv: 2.1.3) [gem]" level="application" />
  142 + <orderEntry type="library" scope="PROVIDED" name="aws-sigv4 (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
142 143 <orderEntry type="library" scope="PROVIDED" name="backport_new_renderer (v1.0.0, rbenv: 2.1.3) [gem]" level="application" />
143 144 <orderEntry type="library" scope="PROVIDED" name="bcrypt (v3.1.11, rbenv: 2.1.3) [gem]" level="application" />
144 145 <orderEntry type="library" scope="PROVIDED" name="builder (v3.2.2, rbenv: 2.1.3) [gem]" level="application" />
... ...
... ... @@ -25,11 +25,25 @@
25 25 </component>
26 26 <component name="FileEditorManager">
27 27 <leaf>
28   - <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
29   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  28 + <file leaf-file-name="admin.html.erb" pinned="false" current-in-tab="false">
  29 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
30 30 <provider selected="true" editor-type-id="text-editor">
31   - <state vertical-scroll-proportion="-6.4444447" vertical-offset="1896" max-vertical-offset="2805">
32   - <caret line="138" column="80" selection-start-line="138" selection-start-column="80" selection-end-line="138" selection-end-column="80" />
  31 + <state vertical-scroll-proportion="-11.875" vertical-offset="0" max-vertical-offset="840">
  32 + <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
  33 + <folding>
  34 + <element signature="e#596#625#0#ruby" expanded="true" />
  35 + <element signature="e#713#733#0#ruby" expanded="true" />
  36 + <element signature="e#1031#1056#0#ruby" expanded="true" />
  37 + </folding>
  38 + </state>
  39 + </provider>
  40 + </entry>
  41 + </file>
  42 + <file leaf-file-name="admin_users_controller.rb" pinned="false" current-in-tab="false">
  43 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb">
  44 + <provider selected="true" editor-type-id="text-editor">
  45 + <state vertical-scroll-proportion="0.0" vertical-offset="176" max-vertical-offset="810">
  46 + <caret line="40" column="7" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
33 47 <folding />
34 48 </state>
35 49 </provider>
... ... @@ -45,16 +59,87 @@
45 59 </provider>
46 60 </entry>
47 61 </file>
  62 + <file leaf-file-name="edit.html.erb" pinned="false" current-in-tab="false">
  63 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">
  64 + <provider selected="true" editor-type-id="text-editor">
  65 + <state vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="300">
  66 + <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />
  67 + <folding>
  68 + <element signature="n#t('admin.admin_users.edit')#0;n#!!top" expanded="true" />
  69 + </folding>
  70 + </state>
  71 + </provider>
  72 + </entry>
  73 + </file>
  74 + <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
  75 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb">
  76 + <provider selected="true" editor-type-id="text-editor">
  77 + <state vertical-scroll-proportion="-1.25" vertical-offset="0" max-vertical-offset="480">
  78 + <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
  79 + <folding>
  80 + <element signature="n#t('activerecord.attributes.admin_user.email')#0;n#!!top" expanded="true" />
  81 + </folding>
  82 + </state>
  83 + </provider>
  84 + </entry>
  85 + </file>
  86 + <file leaf-file-name="en.yml" pinned="false" current-in-tab="false">
  87 + <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
  88 + <provider selected="true" editor-type-id="text-editor">
  89 + <state vertical-scroll-proportion="0.0" vertical-offset="1091" max-vertical-offset="1950">
  90 + <caret line="91" column="28" selection-start-line="91" selection-start-column="28" selection-end-line="91" selection-end-column="28" />
  91 + <folding />
  92 + </state>
  93 + </provider>
  94 + </entry>
  95 + </file>
  96 + <file leaf-file-name="_form.html.erb" pinned="false" current-in-tab="false">
  97 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb">
  98 + <provider selected="true" editor-type-id="text-editor">
  99 + <state vertical-scroll-proportion="-8.75" vertical-offset="0" max-vertical-offset="390">
  100 + <caret line="14" column="101" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" />
  101 + <folding />
  102 + </state>
  103 + </provider>
  104 + </entry>
  105 + </file>
  106 + <file leaf-file-name="new.html.erb" pinned="false" current-in-tab="false">
  107 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/new.html.erb">
  108 + <provider selected="true" editor-type-id="text-editor">
  109 + <state vertical-scroll-proportion="-4.375" vertical-offset="0" max-vertical-offset="225">
  110 + <caret line="7" column="102" selection-start-line="7" selection-start-column="102" selection-end-line="7" selection-end-column="102" />
  111 + <folding>
  112 + <element signature="n#t('admin.admin_users.create')#0;n#!!top" expanded="true" />
  113 + </folding>
  114 + </state>
  115 + </provider>
  116 + </entry>
  117 + </file>
  118 + <file leaf-file-name="routes.rb" pinned="false" current-in-tab="false">
  119 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
  120 + <provider selected="true" editor-type-id="text-editor">
  121 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="990">
  122 + <caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
  123 + <folding />
  124 + </state>
  125 + </provider>
  126 + </entry>
  127 + </file>
  128 + <file leaf-file-name="index.html.erb" pinned="false" current-in-tab="false">
  129 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb">
  130 + <provider selected="true" editor-type-id="text-editor">
  131 + <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="180">
  132 + <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
  133 + <folding />
  134 + </state>
  135 + </provider>
  136 + </entry>
  137 + </file>
48 138 </leaf>
49 139 </component>
50 140 <component name="IdeDocumentHistory">
51 141 <option name="CHANGED_PATHS">
52 142 <list>
53   - <option value="$PROJECT_DIR$/config/initializers/assets.rb" />
54   - <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin_login.html.erb" />
55   - <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
56   - <option value="$PROJECT_DIR$/lib/kanjai.rb" />
57   - <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend_not_login.js" />
58 143 <option value="$PROJECT_DIR$/app/views/kanjai/shared/401.html.erb" />
59 144 <option value="$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb" />
60 145 <option value="$PROJECT_DIR$/lib/tasks/install.rake" />
... ... @@ -63,9 +148,7 @@
63 148 <option value="$PROJECT_DIR$/app/models/kanjai/page_datum.rb" />
64 149 <option value="$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb" />
65 150 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/edit.html.erb" />
66   - <option value="$PROJECT_DIR$/config/locales/en.yml" />
67 151 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/extend/test.js" />
68   - <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
69 152 <option value="$PROJECT_DIR$/lib/kanjai/engine.rb" />
70 153 <option value="$PROJECT_DIR$/app/models/kanjai/page_content.rb" />
71 154 <option value="$PROJECT_DIR$/lib/kanjai/template_parser.rb" />
... ... @@ -80,7 +163,6 @@
80 163 <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/frontend/html_editor.js" />
81 164 <option value="$PROJECT_DIR$/db/migrate/20160804133136_add_image_link_to_kanjai_images.rb" />
82 165 <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/get_gallery.html.erb" />
83   - <option value="$PROJECT_DIR$/config/routes.rb" />
84 166 <option value="$PROJECT_DIR$/app/assets/stylesheets/kanjai/admin/admin.css.scss" />
85 167 <option value="$PROJECT_DIR$/app/models/kanjai/image.rb" />
86 168 <option value="$PROJECT_DIR$/app/models/kanjai/page.rb" />
... ... @@ -100,6 +182,14 @@
100 182 <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/pages_controller.rb" />
101 183 <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
102 184 <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
  185 + <option value="$PROJECT_DIR$/config/routes.rb" />
  186 + <option value="$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb" />
  187 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb" />
  188 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/new.html.erb" />
  189 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb" />
  190 + <option value="$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb" />
  191 + <option value="$PROJECT_DIR$/config/locales/en.yml" />
  192 + <option value="$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb" />
103 193 <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
104 194 </list>
105 195 </option>
... ... @@ -135,6 +225,7 @@
135 225 <sortByType />
136 226 </navigator>
137 227 <panes>
  228 + <pane id="RailsProjectView" />
138 229 <pane id="ProjectPane">
139 230 <subPane>
140 231 <PATH>
... ... @@ -195,6 +286,56 @@
195 286 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
196 287 </PATH_ELEMENT>
197 288 <PATH_ELEMENT>
  289 + <option name="myItemId" value="config" />
  290 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  291 + </PATH_ELEMENT>
  292 + </PATH>
  293 + <PATH>
  294 + <PATH_ELEMENT>
  295 + <option name="myItemId" value="kanjai" />
  296 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  297 + </PATH_ELEMENT>
  298 + <PATH_ELEMENT>
  299 + <option name="myItemId" value="kanjai" />
  300 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  301 + </PATH_ELEMENT>
  302 + <PATH_ELEMENT>
  303 + <option name="myItemId" value="config" />
  304 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  305 + </PATH_ELEMENT>
  306 + <PATH_ELEMENT>
  307 + <option name="myItemId" value="locales" />
  308 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  309 + </PATH_ELEMENT>
  310 + </PATH>
  311 + <PATH>
  312 + <PATH_ELEMENT>
  313 + <option name="myItemId" value="kanjai" />
  314 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  315 + </PATH_ELEMENT>
  316 + <PATH_ELEMENT>
  317 + <option name="myItemId" value="kanjai" />
  318 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  319 + </PATH_ELEMENT>
  320 + <PATH_ELEMENT>
  321 + <option name="myItemId" value="app" />
  322 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  323 + </PATH_ELEMENT>
  324 + <PATH_ELEMENT>
  325 + <option name="myItemId" value="views" />
  326 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  327 + </PATH_ELEMENT>
  328 + </PATH>
  329 + <PATH>
  330 + <PATH_ELEMENT>
  331 + <option name="myItemId" value="kanjai" />
  332 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  333 + </PATH_ELEMENT>
  334 + <PATH_ELEMENT>
  335 + <option name="myItemId" value="kanjai" />
  336 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  337 + </PATH_ELEMENT>
  338 + <PATH_ELEMENT>
198 339 <option name="myItemId" value="app" />
199 340 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
200 341 </PATH_ELEMENT>
... ... @@ -202,6 +343,66 @@
202 343 <option name="myItemId" value="views" />
203 344 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
204 345 </PATH_ELEMENT>
  346 + <PATH_ELEMENT>
  347 + <option name="myItemId" value="kanjai" />
  348 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  349 + </PATH_ELEMENT>
  350 + </PATH>
  351 + <PATH>
  352 + <PATH_ELEMENT>
  353 + <option name="myItemId" value="kanjai" />
  354 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  355 + </PATH_ELEMENT>
  356 + <PATH_ELEMENT>
  357 + <option name="myItemId" value="kanjai" />
  358 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  359 + </PATH_ELEMENT>
  360 + <PATH_ELEMENT>
  361 + <option name="myItemId" value="app" />
  362 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  363 + </PATH_ELEMENT>
  364 + <PATH_ELEMENT>
  365 + <option name="myItemId" value="views" />
  366 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  367 + </PATH_ELEMENT>
  368 + <PATH_ELEMENT>
  369 + <option name="myItemId" value="kanjai" />
  370 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  371 + </PATH_ELEMENT>
  372 + <PATH_ELEMENT>
  373 + <option name="myItemId" value="admin" />
  374 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  375 + </PATH_ELEMENT>
  376 + </PATH>
  377 + <PATH>
  378 + <PATH_ELEMENT>
  379 + <option name="myItemId" value="kanjai" />
  380 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  381 + </PATH_ELEMENT>
  382 + <PATH_ELEMENT>
  383 + <option name="myItemId" value="kanjai" />
  384 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  385 + </PATH_ELEMENT>
  386 + <PATH_ELEMENT>
  387 + <option name="myItemId" value="app" />
  388 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  389 + </PATH_ELEMENT>
  390 + <PATH_ELEMENT>
  391 + <option name="myItemId" value="views" />
  392 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  393 + </PATH_ELEMENT>
  394 + <PATH_ELEMENT>
  395 + <option name="myItemId" value="kanjai" />
  396 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  397 + </PATH_ELEMENT>
  398 + <PATH_ELEMENT>
  399 + <option name="myItemId" value="admin" />
  400 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  401 + </PATH_ELEMENT>
  402 + <PATH_ELEMENT>
  403 + <option name="myItemId" value="admin_users" />
  404 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  405 + </PATH_ELEMENT>
205 406 </PATH>
206 407 <PATH>
207 408 <PATH_ELEMENT>
... ... @@ -253,13 +454,38 @@
253 454 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
254 455 </PATH_ELEMENT>
255 456 <PATH_ELEMENT>
  457 + <option name="myItemId" value="controllers" />
  458 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  459 + </PATH_ELEMENT>
  460 + <PATH_ELEMENT>
  461 + <option name="myItemId" value="kanjai" />
  462 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  463 + </PATH_ELEMENT>
  464 + <PATH_ELEMENT>
  465 + <option name="myItemId" value="admin" />
  466 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  467 + </PATH_ELEMENT>
  468 + </PATH>
  469 + <PATH>
  470 + <PATH_ELEMENT>
  471 + <option name="myItemId" value="kanjai" />
  472 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
  473 + </PATH_ELEMENT>
  474 + <PATH_ELEMENT>
  475 + <option name="myItemId" value="kanjai" />
  476 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  477 + </PATH_ELEMENT>
  478 + <PATH_ELEMENT>
  479 + <option name="myItemId" value="app" />
  480 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
  481 + </PATH_ELEMENT>
  482 + <PATH_ELEMENT>
256 483 <option name="myItemId" value="assets" />
257 484 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
258 485 </PATH_ELEMENT>
259 486 </PATH>
260 487 </subPane>
261 488 </pane>
262   - <pane id="RailsProjectView" />
263 489 <pane id="Scope" />
264 490 </panes>
265 491 </component>
... ... @@ -272,11 +498,11 @@
272 498 </component>
273 499 <component name="RecentsManager">
274 500 <key name="CopyFile.RECENT_KEYS">
  501 + <recent name="$PROJECT_DIR$/app/views/kanjai/admin/admin_users" />
275 502 <recent name="$PROJECT_DIR$/config/initializers" />
276 503 <recent name="$PROJECT_DIR$/bin" />
277 504 <recent name="$PROJECT_DIR$/app/assets/stylesheets/kanjai/general" />
278 505 <recent name="$PROJECT_DIR$/app/assets/javascripts/kanjai/general" />
279   - <recent name="$PROJECT_DIR$/lib" />
280 506 </key>
281 507 <key name="MoveFile.RECENT_KEYS">
282 508 <recent name="$PROJECT_DIR$/app/assets/images/kanjai/fileinput" />
... ... @@ -453,24 +679,24 @@
453 679 <layout>
454 680 <window_info id="Changes" 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" />
455 681 <window_info id="Terminal" 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" />
456   - <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" />
457   - <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" />
458   - <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" />
459   - <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" />
460   - <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" />
461   - <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" />
462 682 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
  683 + <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" />
463 684 <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" />
464 685 <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" />
465   - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.43376413" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  686 + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30452344" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
  687 + <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" />
466 688 <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" />
  689 + <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" />
  690 + <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" />
  691 + <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" />
467 692 <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" />
468 693 <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" />
469 694 <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" />
  695 + <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" />
470 696 <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" />
471 697 <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" />
472   - <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" />
473 698 <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" />
  699 + <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" />
474 700 </layout>
475 701 </component>
476 702 <component name="Vcs.Log.UiProperties">
... ... @@ -496,76 +722,6 @@
496 722 <watches-manager />
497 723 </component>
498 724 <component name="editorHistoryManager">
499   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/show_editor.html.erb">
500   - <provider selected="true" editor-type-id="text-editor">
501   - <state vertical-scroll-proportion="0.0" vertical-offset="360" max-vertical-offset="615">
502   - <caret line="24" column="16" selection-start-line="0" selection-start-column="0" selection-end-line="35" selection-end-column="9" />
503   - </state>
504   - </provider>
505   - </entry>
506   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/application_helper.rb">
507   - <provider selected="true" editor-type-id="text-editor">
508   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="1215">
509   - <caret line="59" column="22" selection-start-line="59" selection-start-column="8" selection-end-line="59" selection-end-column="22" />
510   - </state>
511   - </provider>
512   - </entry>
513   - <entry file="file://$PROJECT_DIR$/app/helpers/kanjai/admin/pages_helper.rb">
514   - <provider selected="true" editor-type-id="text-editor">
515   - <state vertical-scroll-proportion="0.0" vertical-offset="975" max-vertical-offset="2055">
516   - <caret line="65" column="42" selection-start-line="65" selection-start-column="42" selection-end-line="65" selection-end-column="42" />
517   - </state>
518   - </provider>
519   - </entry>
520   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/new.html.erb">
521   - <provider selected="true" editor-type-id="text-editor">
522   - <state vertical-scroll-proportion="-6.875" vertical-offset="0" max-vertical-offset="345">
523   - <caret line="11" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
524   - </state>
525   - </provider>
526   - </entry>
527   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/_edit_resource_links.html.erb">
528   - <provider selected="true" editor-type-id="text-editor">
529   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
530   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
531   - </state>
532   - </provider>
533   - </entry>
534   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/shared/_new_resource_links.html.erb">
535   - <provider selected="true" editor-type-id="text-editor">
536   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
537   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
538   - </state>
539   - </provider>
540   - </entry>
541   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_langs/_form.html.erb">
542   - <provider selected="true" editor-type-id="text-editor">
543   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="610">
544   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="5" selection-end-column="6" />
545   - </state>
546   - </provider>
547   - </entry>
548   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/new.html.erb">
549   - <provider selected="true" editor-type-id="text-editor">
550   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
551   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
552   - </state>
553   - </provider>
554   - </entry>
555   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/admin_extend.js">
556   - <provider selected="true" editor-type-id="text-editor">
557   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
558   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
559   - </state>
560   - </provider>
561   - </entry>
562   - <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/page_templates/edit.html.erb">
563   - <provider selected="true" editor-type-id="text-editor">
564   - <state vertical-scroll-proportion="0.0" vertical-offset="110" max-vertical-offset="660">
565   - <caret line="26" column="19" selection-start-line="22" selection-start-column="0" selection-end-line="26" selection-end-column="19" />
566   - </state>
567   - </provider>
568   - </entry>
569 725 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/page_templates_controller.rb">
570 726 <provider selected="true" editor-type-id="text-editor">
571 727 <state vertical-scroll-proportion="0.0" vertical-offset="1234" max-vertical-offset="1650">
... ... @@ -643,13 +799,6 @@
643 799 </state>
644 800 </provider>
645 801 </entry>
646   - <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
647   - <provider selected="true" editor-type-id="text-editor">
648   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
649   - <caret line="16" column="33" selection-start-line="16" selection-start-column="8" selection-end-line="16" selection-end-column="33" />
650   - </state>
651   - </provider>
652   - </entry>
653 802 <entry file="file://$PROJECT_DIR$/lib/zip.rb">
654 803 <provider selected="true" editor-type-id="text-editor">
655 804 <state vertical-scroll-proportion="0.0" vertical-offset="60" max-vertical-offset="6495">
... ... @@ -763,19 +912,10 @@
763 912 </state>
764 913 </provider>
765 914 </entry>
766   - <entry file="file://$PROJECT_DIR$/config/routes.rb">
767   - <provider selected="true" editor-type-id="text-editor">
768   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="960">
769   - <caret line="5" column="76" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="76" />
770   - <folding />
771   - </state>
772   - </provider>
773   - </entry>
774 915 <entry file="file://$PROJECT_DIR$/app/views/kanjai/pages/show.pdf.erb">
775 916 <provider selected="true" editor-type-id="text-editor">
776 917 <state vertical-scroll-proportion="-0.0" vertical-offset="0" max-vertical-offset="90">
777 918 <caret line="0" column="11" selection-start-line="0" selection-start-column="11" selection-end-line="0" selection-end-column="11" />
778   - <folding />
779 919 </state>
780 920 </provider>
781 921 </entry>
... ... @@ -790,7 +930,6 @@
790 930 <provider selected="true" editor-type-id="text-editor">
791 931 <state vertical-scroll-proportion="0.0" vertical-offset="4001" max-vertical-offset="4635">
792 932 <caret line="230" column="55" selection-start-line="230" selection-start-column="30" selection-end-line="230" selection-end-column="55" />
793   - <folding />
794 933 </state>
795 934 </provider>
796 935 </entry>
... ... @@ -805,7 +944,6 @@
805 944 <provider selected="true" editor-type-id="text-editor">
806 945 <state vertical-scroll-proportion="0.0" vertical-offset="195" max-vertical-offset="30600">
807 946 <caret line="13" column="14" selection-start-line="13" selection-start-column="14" selection-end-line="13" selection-end-column="14" />
808   - <folding />
809 947 </state>
810 948 </provider>
811 949 </entry>
... ... @@ -813,19 +951,72 @@
813 951 <provider selected="true" editor-type-id="text-editor">
814 952 <state vertical-scroll-proportion="-18.88889" vertical-offset="0" max-vertical-offset="1050">
815 953 <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
816   - <folding />
  954 + </state>
  955 + </provider>
  956 + </entry>
  957 + <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/application.css">
  958 + <provider selected="true" editor-type-id="text-editor">
  959 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
  960 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  961 + </state>
  962 + </provider>
  963 + </entry>
  964 + <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
  965 + <provider selected="true" editor-type-id="text-editor">
  966 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7125">
  967 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
817 968 </state>
818 969 </provider>
819 970 </entry>
820 971 <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/application_controller.rb">
821 972 <provider selected="true" editor-type-id="text-editor">
822   - <state vertical-scroll-proportion="0.3966346" vertical-offset="0" max-vertical-offset="416">
  973 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="330">
823 974 <caret line="11" column="46" selection-start-line="11" selection-start-column="16" selection-end-line="11" selection-end-column="46" />
824 975 <folding />
825 976 </state>
826 977 </provider>
827 978 </entry>
828   - <entry file="file://$PROJECT_DIR$/app/assets/stylesheets/kanjai/application.css">
  979 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  980 + <provider selected="true" editor-type-id="text-editor">
  981 + <state vertical-scroll-proportion="0.0" vertical-offset="2078" max-vertical-offset="2805">
  982 + <caret line="153" column="143" selection-start-line="153" selection-start-column="132" selection-end-line="153" selection-end-column="143" />
  983 + <folding />
  984 + </state>
  985 + </provider>
  986 + </entry>
  987 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb">
  988 + <provider selected="true" editor-type-id="text-editor">
  989 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="360">
  990 + <caret line="18" column="3" selection-start-line="18" selection-start-column="3" selection-end-line="18" selection-end-column="3" />
  991 + <folding />
  992 + </state>
  993 + </provider>
  994 + </entry>
  995 + <entry file="file://$PROJECT_DIR$/lib/tasks/install.rake">
  996 + <provider selected="true" editor-type-id="text-editor">
  997 + <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="390">
  998 + <caret line="20" column="3" selection-start-line="20" selection-start-column="3" selection-end-line="20" selection-end-column="3" />
  999 + <folding />
  1000 + </state>
  1001 + </provider>
  1002 + </entry>
  1003 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/config/index.html.erb">
  1004 + <provider selected="true" editor-type-id="text-editor">
  1005 + <state vertical-scroll-proportion="-1.875" vertical-offset="0" max-vertical-offset="180">
  1006 + <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
  1007 + <folding />
  1008 + </state>
  1009 + </provider>
  1010 + </entry>
  1011 + <entry file="file://$PROJECT_DIR$/config/routes.rb">
  1012 + <provider selected="true" editor-type-id="text-editor">
  1013 + <state vertical-scroll-proportion="0.0" vertical-offset="90" max-vertical-offset="990">
  1014 + <caret line="22" column="26" selection-start-line="22" selection-start-column="26" selection-end-line="22" selection-end-column="26" />
  1015 + <folding />
  1016 + </state>
  1017 + </provider>
  1018 + </entry>
  1019 + <entry file="file://$PROJECT_DIR$/config/locales/de.yml">
829 1020 <provider selected="true" editor-type-id="text-editor">
830 1021 <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="634">
831 1022 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
... ... @@ -833,30 +1024,80 @@
833 1024 </state>
834 1025 </provider>
835 1026 </entry>
836   - <entry file="file://$PROJECT_DIR$/app/assets/javascripts/kanjai/rails.js">
  1027 + <entry file="file://$PROJECT_DIR$/app/views/layouts/kanjai/admin.html.erb">
837 1028 <provider selected="true" editor-type-id="text-editor">
838   - <state vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="7125">
839   - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  1029 + <state vertical-scroll-proportion="-11.875" vertical-offset="0" max-vertical-offset="840">
  1030 + <caret line="19" column="26" selection-start-line="19" selection-start-column="26" selection-end-line="19" selection-end-column="26" />
  1031 + <folding>
  1032 + <element signature="e#596#625#0#ruby" expanded="true" />
  1033 + <element signature="e#713#733#0#ruby" expanded="true" />
  1034 + <element signature="e#1031#1056#0#ruby" expanded="true" />
  1035 + </folding>
  1036 + </state>
  1037 + </provider>
  1038 + </entry>
  1039 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/config_controller.rb">
  1040 + <provider selected="true" editor-type-id="text-editor">
  1041 + <state vertical-scroll-proportion="0.09463722" vertical-offset="0" max-vertical-offset="634">
  1042 + <caret line="4" column="7" selection-start-line="0" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
840 1043 <folding />
841 1044 </state>
842 1045 </provider>
843 1046 </entry>
844   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/sessions_controller.rb">
  1047 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/index.html.erb">
  1048 + <provider selected="true" editor-type-id="text-editor">
  1049 + <state vertical-scroll-proportion="-1.25" vertical-offset="0" max-vertical-offset="480">
  1050 + <caret line="2" column="30" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
  1051 + <folding>
  1052 + <element signature="n#t('activerecord.attributes.admin_user.email')#0;n#!!top" expanded="true" />
  1053 + </folding>
  1054 + </state>
  1055 + </provider>
  1056 + </entry>
  1057 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/new.html.erb">
  1058 + <provider selected="true" editor-type-id="text-editor">
  1059 + <state vertical-scroll-proportion="-4.375" vertical-offset="0" max-vertical-offset="225">
  1060 + <caret line="7" column="102" selection-start-line="7" selection-start-column="102" selection-end-line="7" selection-end-column="102" />
  1061 + <folding>
  1062 + <element signature="n#t('admin.admin_users.create')#0;n#!!top" expanded="true" />
  1063 + </folding>
  1064 + </state>
  1065 + </provider>
  1066 + </entry>
  1067 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/_form.html.erb">
845 1068 <provider selected="true" editor-type-id="text-editor">
846   - <state vertical-scroll-proportion="0.14423077" vertical-offset="0" max-vertical-offset="416">
847   - <caret line="4" column="6" selection-start-line="4" selection-start-column="6" selection-end-line="4" selection-end-column="33" />
  1069 + <state vertical-scroll-proportion="-8.75" vertical-offset="0" max-vertical-offset="390">
  1070 + <caret line="14" column="101" selection-start-line="14" selection-start-column="101" selection-end-line="14" selection-end-column="101" />
848 1071 <folding />
849 1072 </state>
850 1073 </provider>
851 1074 </entry>
852   - <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
  1075 + <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/admin/admin_users_controller.rb">
  1076 + <provider selected="true" editor-type-id="text-editor">
  1077 + <state vertical-scroll-proportion="0.0" vertical-offset="176" max-vertical-offset="810">
  1078 + <caret line="40" column="7" selection-start-line="40" selection-start-column="7" selection-end-line="40" selection-end-column="7" />
  1079 + <folding />
  1080 + </state>
  1081 + </provider>
  1082 + </entry>
  1083 + <entry file="file://$PROJECT_DIR$/config/locales/en.yml">
853 1084 <provider selected="true" editor-type-id="text-editor">
854   - <state vertical-scroll-proportion="-6.4444447" vertical-offset="1896" max-vertical-offset="2805">
855   - <caret line="138" column="80" selection-start-line="138" selection-start-column="80" selection-end-line="138" selection-end-column="80" />
  1085 + <state vertical-scroll-proportion="0.0" vertical-offset="1091" max-vertical-offset="1950">
  1086 + <caret line="91" column="28" selection-start-line="91" selection-start-column="28" selection-end-line="91" selection-end-column="28" />
856 1087 <folding />
857 1088 </state>
858 1089 </provider>
859 1090 </entry>
  1091 + <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/admin_users/edit.html.erb">
  1092 + <provider selected="true" editor-type-id="text-editor">
  1093 + <state vertical-scroll-proportion="-5.0" vertical-offset="0" max-vertical-offset="300">
  1094 + <caret line="8" column="102" selection-start-line="8" selection-start-column="102" selection-end-line="8" selection-end-column="102" />
  1095 + <folding>
  1096 + <element signature="n#t('admin.admin_users.edit')#0;n#!!top" expanded="true" />
  1097 + </folding>
  1098 + </state>
  1099 + </provider>
  1100 + </entry>
860 1101 <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
861 1102 <provider selected="true" editor-type-id="text-editor">
862 1103 <state vertical-scroll-proportion="0.023659306" vertical-offset="0" max-vertical-offset="634">
... ...
1 1 PATH
2 2 remote: .
3 3 specs:
4   - kanjai (0.0.64)
  4 + kanjai (0.0.65)
5 5 acts_as_list
6 6 acts_as_tree
7 7 aws-sdk
... ... @@ -64,12 +64,14 @@ GEM
64 64 acts_as_tree (2.6.0)
65 65 activerecord (>= 3.0.0)
66 66 arel (6.0.3)
67   - aws-sdk (2.6.18)
68   - aws-sdk-resources (= 2.6.18)
69   - aws-sdk-core (2.6.18)
  67 + aws-sdk (2.6.23)
  68 + aws-sdk-resources (= 2.6.23)
  69 + aws-sdk-core (2.6.23)
  70 + aws-sigv4 (~> 1.0)
70 71 jmespath (~> 1.0)
71   - aws-sdk-resources (2.6.18)
72   - aws-sdk-core (= 2.6.18)
  72 + aws-sdk-resources (2.6.23)
  73 + aws-sdk-core (= 2.6.23)
  74 + aws-sigv4 (1.0.0)
73 75 backport_new_renderer (1.0.0)
74 76 rails
75 77 bcrypt (3.1.11)
... ...
  1 +module Kanjai
  2 + class Admin::AdminUsersController < AdminController
  3 + before_action :load_user, only: [:edit, :update, :destroy]
  4 +
  5 + def index
  6 + @collection = AdminUser.all
  7 + end
  8 +
  9 + def new
  10 + @user = AdminUser.new
  11 + end
  12 +
  13 + def create
  14 + @user = AdminUser.new(user_params)
  15 + if @user.save
  16 + redirect_to admin_admin_users_url
  17 + else
  18 + render action: :new
  19 + end
  20 + end
  21 +
  22 +
  23 + def update
  24 + if @user.update(user_params)
  25 + redirect_to admin_admin_users_url
  26 + else
  27 + render action: :edit
  28 + end
  29 + end
  30 +
  31 + def destroy
  32 + @user.destroy
  33 +
  34 + render :json => {:status => 'ok'}.to_json
  35 + end
  36 +
  37 + private
  38 +
  39 + def load_user
  40 + @user = AdminUser.find(params[:id])
  41 + end
  42 +
  43 + def user_params
  44 + params.require(:admin_user).permit(:email, :password, :password_confirmation)
  45 + end
  46 +
  47 + end
  48 +end
... ...
  1 +<div class="form-group <%= 'has-error' if @user.errors.include?(:email) %>">
  2 + <%= f.label :email, Kanjai::AdminUser.human_attribute_name(:email) + ' *' %>
  3 + <%= f.email_field :email, class: 'form-control margin-bottom-20' %>
  4 + <%= error_messages(@user, :email) %>
  5 +</div>
  6 +
  7 +<div class="row">
  8 + <div class="col-sm-6 <%= 'has-error' if @user.errors.include?(:password) %>">
  9 + <%= f.label :password, Kanjai::AdminUser.human_attribute_name(:password) + ' *' %>
  10 + <%= f.password_field :password, class: 'form-control margin-bottom-20' %>
  11 + <%= error_messages(@user, :password) %>
  12 +
  13 + </div>
  14 + <div class="col-sm-6 <%= 'has-error' if @user.errors.include?(:password_confirmation) %>">
  15 + <%= f.label :password_confirmation, Kanjai::AdminUser.human_attribute_name(:password_confirmation) + ' *' %>
  16 + <%= f.password_field :password_confirmation, class: 'form-control margin-bottom-20' %>
  17 + <%= error_messages(@user, :password_confirmation) %>
  18 + </div>
  19 +</div>
  20 +
... ...
  1 +<div class="container">
  2 + <h3><%= t('admin.admin_users.edit') %></h3>
  3 +
  4 + <%= render :partial => 'kanjai/shared/error_messages', :locals => {:target => @user} %>
  5 +
  6 +
  7 + <%= form_for @user, url: admin_admin_user_path(@user), method: 'PUT' do |f| %>
  8 + <%= render partial: 'form', locals: {f: f} %>
  9 + <%= render :partial => 'kanjai/shared/new_resource_links', locals: {collection_url: admin_admin_users_url} %>
  10 + <% end %>
  11 +
  12 +
  13 +</div>
  14 +
... ...
  1 +<div class="container">
  2 + <div class="text-right">
  3 + <%= link_to I18n.t('admin.admin_users.create'), new_admin_admin_user_path, class: 'btn btn-default' %>
  4 + </div>
  5 +
  6 + <div>
  7 + <table class="table">
  8 + <thead>
  9 + <tr>
  10 + <th><%= t('activerecord.attributes.admin_user.email') %></th>
  11 + <th></th>
  12 + </tr>
  13 + </thead>
  14 + <tbody>
  15 + <% @collection.each do |item| %>
  16 + <tr id='<%= dom_id(item) %>'>
  17 + <td><%= item.email %></td>
  18 + <td>
  19 + <%= link_to t('edit_action'), edit_admin_admin_user_path(item) %>
  20 + <%= link_to t('delete_action'), admin_admin_user_path(item), :class => 'delete-row-item' %>
  21 + </td>
  22 + </tr>
  23 + <% end %>
  24 + </tbody>
  25 + </table>
  26 + </div>
  27 +</div>
\ No newline at end of file
... ...
  1 +<div class="container">
  2 + <h3><%= t('admin.admin_users.create') %></h3>
  3 +
  4 + <%= render :partial => 'kanjai/shared/error_messages', :locals => {:target => @user} %>
  5 +
  6 + <%= form_for @user, url: admin_admin_users_url do |f| %>
  7 + <%= render partial: 'form', locals: {f: f} %>
  8 + <%= render :partial => 'kanjai/shared/new_resource_links', locals: {collection_url: admin_admin_users_url} %>
  9 + <% end %>
  10 +</div>
\ No newline at end of file
... ...
... ... @@ -14,15 +14,16 @@
14 14
15 15 <div class="container">
16 16 <div class="row">
17   - <div class="col-md-6">
  17 + <div class="col-md-5">
18 18 Hello, <%= current_admin_user.email %>
19 19 </div>
20   - <div class="col-md-6">
  20 + <div class="col-md-7">
21 21 <nav class="navbar navbar-default">
22 22 <div class="container-fluid">
23 23 <div class="navbar-header">
24 24 <%= render :partial => 'shared/extend_admin_menu' %>
25 25 <%= link_to t('configuration_menu_title'), kanjai.admin_configuration_url, :class => 'navbar-brand' %>
  26 + <%= link_to t('user_menu_title'), kanjai.admin_admin_users_url, :class => 'navbar-brand' %>
26 27 <%= link_to t('pages_menu_title'), kanjai.admin_pages_url, :class => 'navbar-brand' %>
27 28 <%= link_to t('page_langs_menu_title'), kanjai.admin_page_langs_url, :class => 'navbar-brand' %>
28 29 <%= link_to t('templates_menu_title'), kanjai.admin_page_templates_url, :class => 'navbar-brand' %>
... ...
... ... @@ -24,6 +24,7 @@ en:
24 24 pages_menu_title: "Pages"
25 25 templates_menu_title: "Templates"
26 26 page_langs_menu_title: "Page Languages"
  27 + user_menu_title: "Admin Users"
27 28 drop_your_file: "Drop your file ..."
28 29 are_you_sure: "Are you sure?"
29 30 page_not_found_html: "Sorry, page not found"
... ... @@ -44,6 +45,10 @@ en:
44 45 default: "%d.%m.%Y %H:%M"
45 46 activerecord:
46 47 attributes:
  48 + kanjai/admin_user:
  49 + email: "E-Mail"
  50 + password: "Password"
  51 + password_confirmation: "Password confirmation"
47 52 page:
48 53 parent_id: Parent Page
49 54 page_template_id: Page Template
... ... @@ -82,7 +87,9 @@ en:
82 87 title: "Log In"
83 88 remember_me: "Remember me"
84 89 login_button: "Log in"
85   -
  90 + admin_users:
  91 + create: "Create new admin user"
  92 + edit: "Edit admin user"
86 93 pages:
87 94 page_title: "Pages"
88 95 add_new: "Add new"
... ...
... ... @@ -20,6 +20,8 @@ Kanjai::Engine.routes.draw do
20 20 post 'page_contents/add_item' => "page_contents#add_item"
21 21 post 'page_contents/delete_item' => "page_contents#delete_item"
22 22
  23 + resources :admin_users
  24 +
23 25 resources :pages do
24 26 get :markdown, on: :member
25 27 get :html, on: :member
... ...
1 1 module Kanjai
2   - VERSION = "0.0.65"
  2 + VERSION = "0.0.66"
3 3 end
... ...