From f38d02b40f29937b47612b85e2ed5f0261506c90 Mon Sep 17 00:00:00 2001 From: Adrian Hinz Date: Sun, 28 Jan 2018 11:29:17 +0100 Subject: [PATCH] public push --- app/controllers/admin/all_page_controller.rb | 29 +- app/controllers/admin/home_controller.rb | 22 +- app/models/all_page.rb | 6 +- app/models/published_page.rb | 8 +- .../_published_pages_priority.html.erb | 56 +- app/views/admin/all_page/index.html.erb | 4 +- .../admin/all_page/pp_priority_down.js.erb | 1 + .../admin/all_page/pp_priority_up.js.erb | 1 + app/views/admin/home/index.html.erb | 45 +- app/views/layouts/admin.html.erb | 7 +- app/views/layouts/application.html.erb | 2 +- app/views/layouts/devise.html.erb | 2 +- config/database.yml | 30 +- config/environments/production.rb | 3 +- config/initializers/devise.rb | 2 +- config/routes.rb | 4 +- config/secrets.yml | 2 +- db/schema.rb | 40 + db/seeds.rb | 7 + ...fest-c1c1aa0b85f3714cbf77666d774bd70a.json | 1 + ...6aad3f5db796e52e1015835a026d00e15b28cd.css | 5718 +++++++++ ...d3f5db796e52e1015835a026d00e15b28cd.css.gz | Bin 0 -> 17647 bytes public/assets/FontAwesome.otf | Bin 0 -> 134808 bytes public/assets/FontAwesome.otf.gz | Bin 0 -> 110373 bytes ...30d6ce108b93b82b0b8d3affffc59a114853451.js | 601 + ...6ce108b93b82b0b8d3affffc59a114853451.js.gz | Bin 0 -> 3986 bytes ...f5a61eb82c8a28c46abb250cab0b3bf9a9ecbc4.js | 1128 ++ ...61eb82c8a28c46abb250cab0b3bf9a9ecbc4.js.gz | Bin 0 -> 5291 bytes ...77da64c34bb6aa40116baaa8d76a75716d9bea.map | 140 + ...221973569ffbb774eef2402fcc13b29b7aecaa.css | 1580 +++ ...973569ffbb774eef2402fcc13b29b7aecaa.css.gz | Bin 0 -> 2860 bytes ...122fa53c8af29b5f90ea4c5accdda9cc63283f.css | 15 + ...fa53c8af29b5f90ea4c5accdda9cc63283f.css.gz | Bin 0 -> 388 bytes ...4dcadcc4199696296805bf477b19d12601c6a22.js | 701 ++ ...adcc4199696296805bf477b19d12601c6a22.js.gz | Bin 0 -> 5565 bytes ...b7eba550d1aaf6a2319c1e89754a5b57b74e020.js | 3852 ++++++ ...ba550d1aaf6a2319c1e89754a5b57b74e020.js.gz | Bin 0 -> 19046 bytes ...13d49359c1320d04e0b2f7e342b54c4e7d4209.css | 8375 +++++++++++++ ...49359c1320d04e0b2f7e342b54c4e7d4209.css.gz | Bin 0 -> 21057 bytes ...526457327a1696eb6ade1248471d2ed76ffdd9.css | 1568 +++ ...457327a1696eb6ade1248471d2ed76ffdd9.css.gz | Bin 0 -> 3371 bytes ...af638018cb2440389f595a40b89f7cbe5a34e1.css | 343 + ...38018cb2440389f595a40b89f7cbe5a34e1.css.gz | Bin 0 -> 1750 bytes ...e4ffaf656e061757ce71bee7630352e055c34a7.js | 6289 ++++++++++ ...faf656e061757ce71bee7630352e055c34a7.js.gz | Bin 0 -> 40787 bytes ...efbcdbc51e532537e2047dd1621365e9de5fe9.map | 1 + ...400ca26ca7c8a79679d4aab00ad959793ce298.map | 1 + ...04ac56528892093a5318f39754b3bd2c6695f7.css | 6758 ++++++++++ ...c56528892093a5318f39754b3bd2c6695f7.css.gz | Bin 0 -> 21020 bytes ...6ae448b23330f8453226efdb074710209474f75.js | 2378 ++++ ...448b23330f8453226efdb074710209474f75.js.gz | Bin 0 -> 14339 bytes ...9dc0605bc0ea86e4cd2bab43aee069bb83d266.map | 1 + ...bbca92887834ebbdf146eafa50b788ea14a8cdb.js | 614 + ...a92887834ebbdf146eafa50b788ea14a8cdb.js.gz | Bin 0 -> 4121 bytes ...0abe99ea7bc166876130c2927c93e7306dbc2df.js | 42 + ...e99ea7bc166876130c2927c93e7306dbc2df.js.gz | Bin 0 -> 569 bytes ...f1aef2d8fda0c18e7b296d402ca01deeef72e4.css | 420 + ...ef2d8fda0c18e7b296d402ca01deeef72e4.css.gz | Bin 0 -> 1838 bytes ...e63d733cb9c789574d0d88a954987667d851cc4.js | 7538 ++++++++++++ ...d733cb9c789574d0d88a954987667d851cc4.js.gz | Bin 0 -> 60788 bytes ...ad3da6219c3f3854a85fc6095b133ec87d4a762.js | 76 + ...da6219c3f3854a85fc6095b133ec87d4a762.js.gz | Bin 0 -> 1121 bytes ...0239d60730210c40cd95b33c0fbb5d4439224b.css | 383 + ...9d60730210c40cd95b33c0fbb5d4439224b.css.gz | Bin 0 -> 2039 bytes ...c52759986df0cef3a5e79261a9fd0c8319522c3.js | 26 + ...759986df0cef3a5e79261a9fd0c8319522c3.js.gz | Bin 0 -> 462 bytes public/assets/favicon.ico | Bin 0 -> 1150 bytes public/assets/favicon.ico.gz | Bin 0 -> 425 bytes public/assets/finanse.jpeg | Bin 0 -> 1155680 bytes ...2f1357c7a2272038dfdd0a2f8cc3cb014755c5.css | 2338 ++++ ...357c7a2272038dfdd0a2f8cc3cb014755c5.css.gz | Bin 0 -> 7290 bytes public/assets/fontawesome-webfont.eot | Bin 0 -> 165742 bytes public/assets/fontawesome-webfont.eot.gz | Bin 0 -> 98200 bytes public/assets/fontawesome-webfont.svg | 2671 ++++ public/assets/fontawesome-webfont.svg.gz | Bin 0 -> 134485 bytes public/assets/fontawesome-webfont.ttf | Bin 0 -> 165548 bytes public/assets/fontawesome-webfont.ttf.gz | Bin 0 -> 98106 bytes public/assets/fontawesome-webfont.woff | Bin 0 -> 98024 bytes public/assets/fontawesome-webfont.woff2 | Bin 0 -> 77160 bytes public/assets/header.jpg | Bin 0 -> 125976 bytes ...3e309a11d7f2612f44dde450b5c157aa5f95c05.js | 4 + ...09a11d7f2612f44dde450b5c157aa5f95c05.js.gz | Bin 0 -> 51 bytes ...6fb92427ae41e4649b934ca495991b7852b855.css | 0 ...92427ae41e4649b934ca495991b7852b855.css.gz | Bin 0 -> 20 bytes ...caa2b98fe5c4b1156ba614e45c5387cc8497fb.css | 1481 +++ ...2b98fe5c4b1156ba614e45c5387cc8497fb.css.gz | Bin 0 -> 8402 bytes ...6ae5f8b7821c0e6896f5ccadda331b94c3eb759.js | 938 ++ ...5f8b7821c0e6896f5ccadda331b94c3eb759.js.gz | Bin 0 -> 6622 bytes ...d8a9750209971b8b1b8f264f91f5518c5fcc060.js | 10254 ++++++++++++++++ ...9750209971b8b1b8f264f91f5518c5fcc060.js.gz | Bin 0 -> 79083 bytes ...810c1184a904047992596dc7b9ea74251ed7962.js | 694 ++ ...c1184a904047992596dc7b9ea74251ed7962.js.gz | Bin 0 -> 6720 bytes ...ee66a507d10c3c3677b1393550abdd5fdeca147.js | 167 + ...6a507d10c3c3677b1393550abdd5fdeca147.js.gz | Bin 0 -> 1189 bytes ...b3e97c20eda99643fcaf5bbe6d41ad59bd12167.js | 3 + ...97c20eda99643fcaf5bbe6d41ad59bd12167.js.gz | Bin 0 -> 23 bytes ...0c349abfd17691458f868c805d4c334946bdc17.js | 626 + ...49abfd17691458f868c805d4c334946bdc17.js.gz | Bin 0 -> 8943 bytes ...efada3f35339170767c4e003105f92d4c204e39.js | 686 ++ ...da3f35339170767c4e003105f92d4c204e39.js.gz | Bin 0 -> 5229 bytes ...5de97675e07fade527056269d9fffdc88a988b.css | 484 + ...97675e07fade527056269d9fffdc88a988b.css.gz | Bin 0 -> 2226 bytes ...eebeb3b7356272a142e2c2afb2f3f576e353b46.js | 5747 +++++++++ ...eb3b7356272a142e2c2afb2f3f576e353b46.js.gz | Bin 0 -> 31144 bytes ...9316e0bf16223466c6b24d548d2ccf1916477e.css | 143 + ...6e0bf16223466c6b24d548d2ccf1916477e.css.gz | Bin 0 -> 789 bytes ...4559428ff96667d6d60af7dd46b014a22d4ca0.css | 1 + ...9428ff96667d6d60af7dd46b014a22d4ca0.css.gz | Bin 0 -> 3154 bytes ...f6f3dfbcca01f050bb146765eaa008e218fdcb0.js | 7280 +++++++++++ ...3dfbcca01f050bb146765eaa008e218fdcb0.js.gz | Bin 0 -> 50138 bytes ...577da85627ab20d9b39a96535917e7ecec0431e.js | 155 + ...da85627ab20d9b39a96535917e7ecec0431e.js.gz | Bin 0 -> 1753 bytes public/assets/summernote.eot | Bin 0 -> 16570 bytes public/assets/summernote.eot.gz | Bin 0 -> 10059 bytes ...6ce387f981f063fa693a94a1931c41022f2f6e.map | 1 + public/assets/summernote.ttf | Bin 0 -> 16384 bytes public/assets/summernote.ttf.gz | Bin 0 -> 10004 bytes public/assets/summernote.woff | Bin 0 -> 10184 bytes ...05df53d12904d5cafdd47c7ffd91ba25cbec128.js | 7 + ...f53d12904d5cafdd47c7ffd91ba25cbec128.js.gz | Bin 0 -> 8433 bytes ...08d7806d0a1c9393fc674759915badc6d6390b2.js | 42 + ...7806d0a1c9393fc674759915badc6d6390b2.js.gz | Bin 0 -> 1079 bytes 122 files changed, 82467 insertions(+), 75 deletions(-) create mode 100644 app/views/admin/all_page/pp_priority_down.js.erb create mode 100644 app/views/admin/all_page/pp_priority_up.js.erb create mode 100644 public/assets/.sprockets-manifest-c1c1aa0b85f3714cbf77666d774bd70a.json create mode 100644 public/assets/AdminLTE-a8e23bb53bf8c627865c70c1a16aad3f5db796e52e1015835a026d00e15b28cd.css create mode 100644 public/assets/AdminLTE-a8e23bb53bf8c627865c70c1a16aad3f5db796e52e1015835a026d00e15b28cd.css.gz create mode 100644 public/assets/FontAwesome.otf create mode 100644 public/assets/FontAwesome.otf.gz create mode 100644 public/assets/action_cable-69fddfcddf4fdef9828648f9330d6ce108b93b82b0b8d3affffc59a114853451.js create mode 100644 public/assets/action_cable-69fddfcddf4fdef9828648f9330d6ce108b93b82b0b8d3affffc59a114853451.js.gz create mode 100644 public/assets/adminlte-be606cfef0f7c043e773f9f9ff5a61eb82c8a28c46abb250cab0b3bf9a9ecbc4.js create mode 100644 public/assets/adminlte-be606cfef0f7c043e773f9f9ff5a61eb82c8a28c46abb250cab0b3bf9a9ecbc4.js.gz create mode 100644 public/assets/adminlte.css-ce59a55d3d826da4ce3495f90d77da64c34bb6aa40116baaa8d76a75716d9bea.map create mode 100644 public/assets/animate-9cb946a1e3a09da18a25dbaf31221973569ffbb774eef2402fcc13b29b7aecaa.css create mode 100644 public/assets/animate-9cb946a1e3a09da18a25dbaf31221973569ffbb774eef2402fcc13b29b7aecaa.css.gz create mode 100644 public/assets/application-18157c666aa5f54338350dab22122fa53c8af29b5f90ea4c5accdda9cc63283f.css create mode 100644 public/assets/application-18157c666aa5f54338350dab22122fa53c8af29b5f90ea4c5accdda9cc63283f.css.gz create mode 100644 public/assets/application-ceb581705462b4241f3101d3d4dcadcc4199696296805bf477b19d12601c6a22.js create mode 100644 public/assets/application-ceb581705462b4241f3101d3d4dcadcc4199696296805bf477b19d12601c6a22.js.gz create mode 100644 public/assets/bootstrap-371cae0dea6c5623d01d5b388b7eba550d1aaf6a2319c1e89754a5b57b74e020.js create mode 100644 public/assets/bootstrap-371cae0dea6c5623d01d5b388b7eba550d1aaf6a2319c1e89754a5b57b74e020.js.gz create mode 100644 public/assets/bootstrap-670ea68a62bbd6fb187f6535cf13d49359c1320d04e0b2f7e342b54c4e7d4209.css create mode 100644 public/assets/bootstrap-670ea68a62bbd6fb187f6535cf13d49359c1320d04e0b2f7e342b54c4e7d4209.css.gz create mode 100644 public/assets/bootstrap-grid-d8b25e4a6a6ed7a0a0b5f9b5ad526457327a1696eb6ade1248471d2ed76ffdd9.css create mode 100644 public/assets/bootstrap-grid-d8b25e4a6a6ed7a0a0b5f9b5ad526457327a1696eb6ade1248471d2ed76ffdd9.css.gz create mode 100644 public/assets/bootstrap-reboot-d67427bd60b33875e775708241af638018cb2440389f595a40b89f7cbe5a34e1.css create mode 100644 public/assets/bootstrap-reboot-d67427bd60b33875e775708241af638018cb2440389f595a40b89f7cbe5a34e1.css.gz create mode 100644 public/assets/bootstrap.bundle-4f30629ce63151a8b165223afe4ffaf656e061757ce71bee7630352e055c34a7.js create mode 100644 public/assets/bootstrap.bundle-4f30629ce63151a8b165223afe4ffaf656e061757ce71bee7630352e055c34a7.js.gz create mode 100644 public/assets/bootstrap.bundle.js-6ec12cc198602e61a54ecad0e3efbcdbc51e532537e2047dd1621365e9de5fe9.map create mode 100644 public/assets/bootstrap.css-bc080fed21141f1fe754dba7da400ca26ca7c8a79679d4aab00ad959793ce298.map create mode 100644 public/assets/bootstrap_lte-47449653e273cb34b0c9481fcc04ac56528892093a5318f39754b3bd2c6695f7.css create mode 100644 public/assets/bootstrap_lte-47449653e273cb34b0c9481fcc04ac56528892093a5318f39754b3bd2c6695f7.css.gz create mode 100644 public/assets/bootstrap_lte-b38817c3e3a3049abb1fc08dd6ae448b23330f8453226efdb074710209474f75.js create mode 100644 public/assets/bootstrap_lte-b38817c3e3a3049abb1fc08dd6ae448b23330f8453226efdb074710209474f75.js.gz create mode 100644 public/assets/bootstrap_lte.css-9cd84a2a5162c816a8bbbd79cf9dc0605bc0ea86e4cd2bab43aee069bb83d266.map create mode 100644 public/assets/cable-418359aee98ceddc6038da7d5bbca92887834ebbdf146eafa50b788ea14a8cdb.js create mode 100644 public/assets/cable-418359aee98ceddc6038da7d5bbca92887834ebbdf146eafa50b788ea14a8cdb.js.gz create mode 100644 public/assets/clean-blog-45b03d28f43deadfa965420eb0abe99ea7bc166876130c2927c93e7306dbc2df.js create mode 100644 public/assets/clean-blog-45b03d28f43deadfa965420eb0abe99ea7bc166876130c2927c93e7306dbc2df.js.gz create mode 100644 public/assets/clean-blog-b52c48f3912e05ef92eda612d7f1aef2d8fda0c18e7b296d402ca01deeef72e4.css create mode 100644 public/assets/clean-blog-b52c48f3912e05ef92eda612d7f1aef2d8fda0c18e7b296d402ca01deeef72e4.css.gz create mode 100644 public/assets/coffee-script-1fc277cf20f802ad03dadce9de63d733cb9c789574d0d88a954987667d851cc4.js create mode 100644 public/assets/coffee-script-1fc277cf20f802ad03dadce9de63d733cb9c789574d0d88a954987667d851cc4.js.gz create mode 100644 public/assets/contact_me-fee88a265fa4062cac7e7f655ad3da6219c3f3854a85fc6095b133ec87d4a762.js create mode 100644 public/assets/contact_me-fee88a265fa4062cac7e7f655ad3da6219c3f3854a85fc6095b133ec87d4a762.js.gz create mode 100644 public/assets/creative-2a62d676908909c20c4ea2214f0239d60730210c40cd95b33c0fbb5d4439224b.css create mode 100644 public/assets/creative-2a62d676908909c20c4ea2214f0239d60730210c40cd95b33c0fbb5d4439224b.css.gz create mode 100644 public/assets/creative-5dc9a268c67fbb6fc7a585860c52759986df0cef3a5e79261a9fd0c8319522c3.js create mode 100644 public/assets/creative-5dc9a268c67fbb6fc7a585860c52759986df0cef3a5e79261a9fd0c8319522c3.js.gz create mode 100644 public/assets/favicon.ico create mode 100644 public/assets/favicon.ico.gz create mode 100644 public/assets/finanse.jpeg create mode 100644 public/assets/font-awesome-c18b9d96f88d5b1c42311cbc512f1357c7a2272038dfdd0a2f8cc3cb014755c5.css create mode 100644 public/assets/font-awesome-c18b9d96f88d5b1c42311cbc512f1357c7a2272038dfdd0a2f8cc3cb014755c5.css.gz create mode 100644 public/assets/fontawesome-webfont.eot create mode 100644 public/assets/fontawesome-webfont.eot.gz create mode 100644 public/assets/fontawesome-webfont.svg create mode 100644 public/assets/fontawesome-webfont.svg.gz create mode 100644 public/assets/fontawesome-webfont.ttf create mode 100644 public/assets/fontawesome-webfont.ttf.gz create mode 100644 public/assets/fontawesome-webfont.woff create mode 100644 public/assets/fontawesome-webfont.woff2 create mode 100644 public/assets/header.jpg create mode 100644 public/assets/home-877aef30ae1b040ab8a3aba4e3e309a11d7f2612f44dde450b5c157aa5f95c05.js create mode 100644 public/assets/home-877aef30ae1b040ab8a3aba4e3e309a11d7f2612f44dde450b5c157aa5f95c05.js.gz create mode 100644 public/assets/home-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.css create mode 100644 public/assets/home-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855.css.gz create mode 100644 public/assets/ionicons-f8e88ec5561ebe0b44c38b3c0acaa2b98fe5c4b1156ba614e45c5387cc8497fb.css create mode 100644 public/assets/ionicons-f8e88ec5561ebe0b44c38b3c0acaa2b98fe5c4b1156ba614e45c5387cc8497fb.css.gz create mode 100644 public/assets/jqBootstrapValidation-7591c8ba2912d80cbd394ad636ae5f8b7821c0e6896f5ccadda331b94c3eb759.js create mode 100644 public/assets/jqBootstrapValidation-7591c8ba2912d80cbd394ad636ae5f8b7821c0e6896f5ccadda331b94c3eb759.js.gz create mode 100644 public/assets/jquery-06c43429d1047ce3f355da574d8a9750209971b8b1b8f264f91f5518c5fcc060.js create mode 100644 public/assets/jquery-06c43429d1047ce3f355da574d8a9750209971b8b1b8f264f91f5518c5fcc060.js.gz create mode 100644 public/assets/jquery-sortable-9171d22af575ea4a1a1c7199d810c1184a904047992596dc7b9ea74251ed7962.js create mode 100644 public/assets/jquery-sortable-9171d22af575ea4a1a1c7199d810c1184a904047992596dc7b9ea74251ed7962.js.gz create mode 100644 public/assets/jquery.easing-b6fcd81310e184b49e8db3759ee66a507d10c3c3677b1393550abdd5fdeca147.js create mode 100644 public/assets/jquery.easing-b6fcd81310e184b49e8db3759ee66a507d10c3c3677b1393550abdd5fdeca147.js.gz create mode 100644 public/assets/manifest-6a3cf5192354f71615ac51034b3e97c20eda99643fcaf5bbe6d41ad59bd12167.js create mode 100644 public/assets/manifest-6a3cf5192354f71615ac51034b3e97c20eda99643fcaf5bbe6d41ad59bd12167.js.gz create mode 100644 public/assets/notify-d63ec3ed8c7330a9902dbe1590c349abfd17691458f868c805d4c334946bdc17.js create mode 100644 public/assets/notify-d63ec3ed8c7330a9902dbe1590c349abfd17691458f868c805d4c334946bdc17.js.gz create mode 100644 public/assets/rails-ujs-817d9a8cb641f7125060cb18fefada3f35339170767c4e003105f92d4c204e39.js create mode 100644 public/assets/rails-ujs-817d9a8cb641f7125060cb18fefada3f35339170767c4e003105f92d4c204e39.js.gz create mode 100644 public/assets/select2-c6ac55e050e3e6db253b3e8c575de97675e07fade527056269d9fffdc88a988b.css create mode 100644 public/assets/select2-c6ac55e050e3e6db253b3e8c575de97675e07fade527056269d9fffdc88a988b.css.gz create mode 100644 public/assets/select2-f06132715d742c9a069566462eebeb3b7356272a142e2c2afb2f3f576e353b46.js create mode 100644 public/assets/select2-f06132715d742c9a069566462eebeb3b7356272a142e2c2afb2f3f576e353b46.js.gz create mode 100644 public/assets/skin-blue-0d27848026bf07036652446cf59316e0bf16223466c6b24d548d2ccf1916477e.css create mode 100644 public/assets/skin-blue-0d27848026bf07036652446cf59316e0bf16223466c6b24d548d2ccf1916477e.css.gz create mode 100644 public/assets/summernote-5b2494224cde9b375b5b4404734559428ff96667d6d60af7dd46b014a22d4ca0.css create mode 100644 public/assets/summernote-5b2494224cde9b375b5b4404734559428ff96667d6d60af7dd46b014a22d4ca0.css.gz create mode 100644 public/assets/summernote-6f99abfd887ff051f9cf891f3f6f3dfbcca01f050bb146765eaa008e218fdcb0.js create mode 100644 public/assets/summernote-6f99abfd887ff051f9cf891f3f6f3dfbcca01f050bb146765eaa008e218fdcb0.js.gz create mode 100644 public/assets/summernote-pl-PL-50e75cb7e8c2f6aef74cafd96577da85627ab20d9b39a96535917e7ecec0431e.js create mode 100644 public/assets/summernote-pl-PL-50e75cb7e8c2f6aef74cafd96577da85627ab20d9b39a96535917e7ecec0431e.js.gz create mode 100644 public/assets/summernote.eot create mode 100644 public/assets/summernote.eot.gz create mode 100644 public/assets/summernote.js-ab7267ac6e9a8596cfa4ce214c6ce387f981f063fa693a94a1931c41022f2f6e.map create mode 100644 public/assets/summernote.ttf create mode 100644 public/assets/summernote.ttf.gz create mode 100644 public/assets/summernote.woff create mode 100644 public/assets/turbolinks-2db6ec539b9190f75e1d477b305df53d12904d5cafdd47c7ffd91ba25cbec128.js create mode 100644 public/assets/turbolinks-2db6ec539b9190f75e1d477b305df53d12904d5cafdd47c7ffd91ba25cbec128.js.gz create mode 100644 public/assets/whcookies-f5fe06f945fd83a700ac6ee3d08d7806d0a1c9393fc674759915badc6d6390b2.js create mode 100644 public/assets/whcookies-f5fe06f945fd83a700ac6ee3d08d7806d0a1c9393fc674759915badc6d6390b2.js.gz diff --git a/app/controllers/admin/all_page_controller.rb b/app/controllers/admin/all_page_controller.rb index 5a9f9a3..bc7e392 100644 --- a/app/controllers/admin/all_page_controller.rb +++ b/app/controllers/admin/all_page_controller.rb @@ -3,7 +3,7 @@ class Admin::AllPageController < ApplicationController layout 'admin' def index @all_pages = AllPage.where('type_of != 3') - @published_pages = PublishedPage.where('type_of = 1 OR type_of = 2').order('priority ASC') + get_pp_pages end def show @@ -64,8 +64,27 @@ class Admin::AllPageController < ApplicationController redirect_to action: 'index' end - def change_priority + def pp_priority_up + pp_this = PublishedPage.find(params[:id]) + pp_this_prio = pp_this.priority + pp_last = PublishedPage.where('(type_of = 1 OR type_of = 2) AND priority < ?', pp_this_prio).order('priority DESC').first + pp_this.priority = pp_last.priority + pp_this.save + pp_last.priority = pp_this_prio + pp_last.save + get_pp_pages + end + + def pp_priority_down + pp_this = PublishedPage.find(params[:id]) + pp_this_prio = pp_this.priority + pp_last = PublishedPage.where('(type_of = 1 OR type_of = 2) AND priority > ?', pp_this_prio).order('priority ASC').first + pp_this.priority = pp_last.priority + pp_this.save + pp_last.priority = pp_this_prio + pp_last.save + get_pp_pages end def publish @@ -121,6 +140,12 @@ class Admin::AllPageController < ApplicationController end end + def get_pp_pages + @published_pages = PublishedPage.where('type_of = 1 OR type_of = 2').order('priority ASC') + @pp_first = PublishedPage.where('type_of = 1 OR type_of = 2').order('priority ASC').first + @pp_last = PublishedPage.where('type_of = 1 OR type_of = 2').order('priority DESC').first + end + private def all_page_params params.require(:all_page).permit(:name, :article_id, :title, :type_of, :full_text) diff --git a/app/controllers/admin/home_controller.rb b/app/controllers/admin/home_controller.rb index 0dcd677..e7c2745 100644 --- a/app/controllers/admin/home_controller.rb +++ b/app/controllers/admin/home_controller.rb @@ -2,6 +2,26 @@ class Admin::HomeController < ApplicationController before_action :authenticate_admin! layout 'admin' def index - @adm = Admin.all + @admin = current_admin + end + + def change_pass + @admin = current_admin + if params[:admin][:password].blank? + params[:admin].delete(:password) + params[:admin].delete(:password_confirmation) + end + if @admin.update(admin_params) + bypass_sign_in(@admin) + redirect_to action: 'index' + else + render "index" + end + end + + private + + def admin_params + params.require(:admin).permit(:description, :password, :password_confirmation) end end diff --git a/app/models/all_page.rb b/app/models/all_page.rb index df2ea4b..e58ca4f 100644 --- a/app/models/all_page.rb +++ b/app/models/all_page.rb @@ -5,7 +5,11 @@ class AllPage < ApplicationRecord belongs_to :article, optional: true has_one :published_page before_destroy :b_destroy - + + def should_generate_new_friendly_id? + slug.blank? || title_changed? + end + PAGE_TYPES = { 1 => 'Strona zwykła', 2 => 'Strona z listą wpisów', diff --git a/app/models/published_page.rb b/app/models/published_page.rb index f75cd26..fb3f835 100644 --- a/app/models/published_page.rb +++ b/app/models/published_page.rb @@ -4,11 +4,17 @@ class PublishedPage < ApplicationRecord belongs_to :all_page belongs_to :article, optional: true + + def should_generate_new_friendly_id? + slug.blank? || title_changed? + end + def published true end def created_name - Admin.find(self.created_by).description + admin = Admin.find(self.created_by) + admin.blank? ? 'nieznany' : admin.description end def created_date diff --git a/app/views/admin/all_page/_published_pages_priority.html.erb b/app/views/admin/all_page/_published_pages_priority.html.erb index 6a1dcfe..5ea46ae 100644 --- a/app/views/admin/all_page/_published_pages_priority.html.erb +++ b/app/views/admin/all_page/_published_pages_priority.html.erb @@ -1,31 +1,29 @@ - -

-<% content_for :footer_scripts do %>
-<%= javascript_include_tag 'jquery-sortable' %>
-  
-<% end %>
+        
+        
+          <%= pp.name %>
+        
+      
+    <% end %>
+  
+
diff --git a/app/views/admin/all_page/index.html.erb b/app/views/admin/all_page/index.html.erb
index 5ab286d..f82d5db 100644
--- a/app/views/admin/all_page/index.html.erb
+++ b/app/views/admin/all_page/index.html.erb
@@ -12,7 +12,6 @@
     
   
 
-<% if false %>
 
@@ -21,10 +20,9 @@
-
+
<%= render 'published_pages_priority' %>
-<% end %> diff --git a/app/views/admin/all_page/pp_priority_down.js.erb b/app/views/admin/all_page/pp_priority_down.js.erb new file mode 100644 index 0000000..246f178 --- /dev/null +++ b/app/views/admin/all_page/pp_priority_down.js.erb @@ -0,0 +1 @@ +$('#pp_priority').html('<%= escape_javascript(render('/admin/all_page/published_pages_priority')) %>'); diff --git a/app/views/admin/all_page/pp_priority_up.js.erb b/app/views/admin/all_page/pp_priority_up.js.erb new file mode 100644 index 0000000..246f178 --- /dev/null +++ b/app/views/admin/all_page/pp_priority_up.js.erb @@ -0,0 +1 @@ +$('#pp_priority').html('<%= escape_javascript(render('/admin/all_page/published_pages_priority')) %>'); diff --git a/app/views/admin/home/index.html.erb b/app/views/admin/home/index.html.erb index 60cf235..28be1ec 100644 --- a/app/views/admin/home/index.html.erb +++ b/app/views/admin/home/index.html.erb @@ -1 +1,44 @@ -

ToDo - Zmiana hasła, do logowania

+
+ +
+ +
+
+

Zmiana danych

+
+ + + <%= form_tag({controller: '/admin/home', action: :change_pass}) do %> +
+ <% if @admin.errors.any? %> + <%= raw errors_to_html(@admin.errors) %> + <% end %> +
+ + <%= text_field :admin, :description, class: "form-control", placeholder: 'Opis' %> +
+
+ + <%= password_field :admin, :password, class: "form-control", placeholder: 'Nowe Hasło' %> +
+
+ + <%= password_field :admin, :password_confirmation, class: "form-control", placeholder: 'Powtórz Nowe Hasło' %> +
+
+ + + + <% end %> +
+ + +
+ + +
+
+ +
diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 78ac487..2b189f7 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -3,7 +3,7 @@ Ubezpieczenie - Należności - Panel Administracyjny <%= csrf_meta_tags %> - <%= favicon_link_tag %> + <%= stylesheet_link_tag 'application','bootstrap_lte' , 'font-awesome' , media: 'all', 'data-turbolinks-track': 'reload' %> <%= stylesheet_link_tag 'AdminLTE', 'skin-blue', 'summernote' %> @@ -41,11 +41,6 @@ <%= current_admin.email %>