From 02ddf963714ac0a9dfaeb7dad84c2e59b8515fd3 Mon Sep 17 00:00:00 2001 From: rainydaysavings Date: Sat, 20 Jun 2020 22:54:28 +0100 Subject: [PATCH] [UI][ROUTES] Better use of icons, fixing static pages routing. --- public/assets/icons/Read Me.txt | 15 -- public/assets/icons/{SVG => }/attach.svg | 0 public/assets/icons/avatar.svg | 5 + public/assets/icons/demo-external-svg.html | 61 ----- public/assets/icons/demo-files/demo.css | 147 ----------- public/assets/icons/demo.html | 94 ------- public/assets/icons/{SVG => }/drop.svg | 0 public/assets/icons/{SVG => }/heart.svg | 0 public/assets/icons/{SVG => }/logo.svg | 0 public/assets/icons/{SVG => }/menu.svg | 0 public/assets/icons/{SVG => }/recycle.svg | 0 public/assets/icons/{SVG => }/reply.svg | 0 public/assets/icons/{SVG => }/search.svg | 0 public/assets/icons/selection.json | 280 --------------------- public/assets/icons/sprite/sprite.css | 46 ---- public/assets/icons/sprite/sprite.html | 104 -------- public/assets/icons/sprite/sprite.svg | 32 --- public/assets/icons/style.css | 16 -- public/assets/icons/svgxuse.js | 230 ----------------- public/assets/icons/symbol-defs.svg | 32 --- src/Controller/FaqHome.php | 101 -------- src/Routes/Main.php | 17 ++ templates/base.html.twig | 80 ++++-- templates/faq/base.html.twig | 58 +---- 24 files changed, 89 insertions(+), 1229 deletions(-) delete mode 100644 public/assets/icons/Read Me.txt rename public/assets/icons/{SVG => }/attach.svg (100%) create mode 100644 public/assets/icons/avatar.svg delete mode 100644 public/assets/icons/demo-external-svg.html delete mode 100644 public/assets/icons/demo-files/demo.css delete mode 100644 public/assets/icons/demo.html rename public/assets/icons/{SVG => }/drop.svg (100%) rename public/assets/icons/{SVG => }/heart.svg (100%) rename public/assets/icons/{SVG => }/logo.svg (100%) rename public/assets/icons/{SVG => }/menu.svg (100%) rename public/assets/icons/{SVG => }/recycle.svg (100%) rename public/assets/icons/{SVG => }/reply.svg (100%) rename public/assets/icons/{SVG => }/search.svg (100%) delete mode 100644 public/assets/icons/selection.json delete mode 100644 public/assets/icons/sprite/sprite.css delete mode 100644 public/assets/icons/sprite/sprite.html delete mode 100644 public/assets/icons/sprite/sprite.svg delete mode 100644 public/assets/icons/style.css delete mode 100644 public/assets/icons/svgxuse.js delete mode 100644 public/assets/icons/symbol-defs.svg delete mode 100644 src/Controller/FaqHome.php diff --git a/public/assets/icons/Read Me.txt b/public/assets/icons/Read Me.txt deleted file mode 100644 index b3dea885a7..0000000000 --- a/public/assets/icons/Read Me.txt +++ /dev/null @@ -1,15 +0,0 @@ -The *SVG* folder contains the icons you selected as separate SVG files. - -If you prefer using PNGs, PDFs, or CSS sprites, refer to the Preferences panel of the IcoMoon app before downloading your zip pack. - -*demo.html* lists the icons that you selected. To insert your icons as inline SVGs (with the element), copy the element (that contains symbol definitions) from the source of the demo.html file, below your own HTML's tag. After copying this SVG, you can reference your glyphs like the following: - - - -You can get this code from the SVG tab of the IcoMoon app, or by referring to the source of the demo.html file. To see how you can change the color/size of your icons using CSS, refer to the example provided in the *style.css* file. - -If you prefer to reference an external SVG (containing ) instead of embedding it in HTML, you will need to use *svgxuse.js* in order to support IE 9+. In browsers that don't support referencing external SVGs (such as IE 9), this polyfill sends one HTTP request to fetch and cache all symbol definitions. See *demo-external-svg.html* for this approach. This demo references the *symbol-defs.svg* file and uses the aforementioned polyfill. Note that it must be hosted on a web server to work -properly. Learn more about this polyfill here: https://github.com/Keyamoon/svgxuse - -You can import *selection.json* back to the IcoMoon app using the *Import Icons* button (or via Main Menu → Manage Projects) to retrieve your icon selection. - diff --git a/public/assets/icons/SVG/attach.svg b/public/assets/icons/attach.svg similarity index 100% rename from public/assets/icons/SVG/attach.svg rename to public/assets/icons/attach.svg diff --git a/public/assets/icons/avatar.svg b/public/assets/icons/avatar.svg new file mode 100644 index 0000000000..30d6aae496 --- /dev/null +++ b/public/assets/icons/avatar.svg @@ -0,0 +1,5 @@ + + +avatar + + diff --git a/public/assets/icons/demo-external-svg.html b/public/assets/icons/demo-external-svg.html deleted file mode 100644 index 8cdcff37d9..0000000000 --- a/public/assets/icons/demo-external-svg.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - IcoMoon - SVG Icons - - - - - - -
-
-

SVG Icons - Generated by IcoMoon

Notice: This demo (along with "symbol-defs.svg" and "svgxuse.js" files) should be hosted on a web server to work properly.

-
-
-
-

Grid Size: 0

-
-
- icon-drop -
-
-
-
- icon-attach -
-
-
-
- icon-heart -
-
-
-
- icon-logo -
-
-
-
- icon-reply -
-
-
-
- icon-menu -
-
-
-
- icon-recycle -
-
-
-
- icon-search -
-
-
- - - diff --git a/public/assets/icons/demo-files/demo.css b/public/assets/icons/demo-files/demo.css deleted file mode 100644 index 35b4e4a1d6..0000000000 --- a/public/assets/icons/demo-files/demo.css +++ /dev/null @@ -1,147 +0,0 @@ -body { - padding: 0; - margin: 0; - font-family: sans-serif; - font-size: 1em; - line-height: 1.5; - color: #555; - background: #fff; -} -h1 { - font-size: 1.5em; - font-weight: normal; - box-shadow: 0 1px #ddd, 0 2px #fff, 0 3px #ddd; -} -small { - font-size: .66666667em; -} -a { - color: #e74c3c; - text-decoration: none; -} -a:hover, a:focus { - box-shadow: 0 1px #e74c3c; -} -.bshadow0, input { - box-shadow: inset 0 -2px #e7e7e7; -} -input:hover { - box-shadow: inset 0 -2px #ccc; -} -input, fieldset { - font-size: 1em; - margin: 0; - padding: 0; - border: 0; -} -input { - color: inherit; - line-height: 1.5; - height: 1.5em; - padding: .25em 0; -} -input:focus { - outline: none; - box-shadow: inset 0 -2px #449fdb; -} -.glyph { - font-size: 16px; - margin-right: 1.5em; - float: left; - width: 17em; -} -svg { - color: #000; -} -.liga { - width: 80%; - width: calc(100% - 2.5em); -} -.talign-right { - text-align: right; -} -.talign-center { - text-align: center; -} -.bgc1 { - background: #f1f1f1; -} -.fgc0 { - color: #000; -} -.fgc1 { - color: #999; -} -p { - margin-top: 1em; - margin-bottom: 1em; -} -.mvm { - margin-top: .75em; - margin-bottom: .75em; -} -.mtn { - margin-top: 0; -} -.mtl, .mal { - margin-top: 1.5em; -} -.mbl, .mal { - margin-bottom: 1.5em; -} -.mal, .mhl { - margin-left: 1.5em; - margin-right: 1.5em; -} -.mhmm { - margin-left: 1em; - margin-right: 1em; -} -.ptl { - padding-top: 1.5em; -} -.pbs, .pvs { - padding-bottom: .25em; -} -.pvs, .pts { - padding-top: .25em; -} -.unit { - float: left; -} -.unitRight { - float: right; -} -.size1of2 { - width: 50%; -} -.size1of1 { - width: 100%; -} -.clearfix:before, .clearfix:after { - content: " "; - display: table; -} -.clearfix:after { - clear: both; -} -.hidden-true { - display: none; -} -.textbox0 { - width: 3em; - background: #f1f1f1; - padding: .25em .5em; - line-height: 1.5; - height: 1.5em; -} -.fs0 { - font-size: 16px; -} -.fs1 { - font-size: 32px; -} -.name { - margin-left: .25em; -} - diff --git a/public/assets/icons/demo.html b/public/assets/icons/demo.html deleted file mode 100644 index 4d7a89bb99..0000000000 --- a/public/assets/icons/demo.html +++ /dev/null @@ -1,94 +0,0 @@ - - - - IcoMoon - SVG Icons - - - - - - - - -
-
-

SVG Icons - Generated by IcoMoon

-
-
-
-

Grid Size: 0

-
-
- icon-drop -
-
-
-
- icon-attach -
-
-
-
- icon-heart -
-
-
-
- icon-logo -
-
-
-
- icon-reply -
-
-
-
- icon-menu -
-
-
-
- icon-recycle -
-
-
-
- icon-search -
-
-
- - - diff --git a/public/assets/icons/SVG/drop.svg b/public/assets/icons/drop.svg similarity index 100% rename from public/assets/icons/SVG/drop.svg rename to public/assets/icons/drop.svg diff --git a/public/assets/icons/SVG/heart.svg b/public/assets/icons/heart.svg similarity index 100% rename from public/assets/icons/SVG/heart.svg rename to public/assets/icons/heart.svg diff --git a/public/assets/icons/SVG/logo.svg b/public/assets/icons/logo.svg similarity index 100% rename from public/assets/icons/SVG/logo.svg rename to public/assets/icons/logo.svg diff --git a/public/assets/icons/SVG/menu.svg b/public/assets/icons/menu.svg similarity index 100% rename from public/assets/icons/SVG/menu.svg rename to public/assets/icons/menu.svg diff --git a/public/assets/icons/SVG/recycle.svg b/public/assets/icons/recycle.svg similarity index 100% rename from public/assets/icons/SVG/recycle.svg rename to public/assets/icons/recycle.svg diff --git a/public/assets/icons/SVG/reply.svg b/public/assets/icons/reply.svg similarity index 100% rename from public/assets/icons/SVG/reply.svg rename to public/assets/icons/reply.svg diff --git a/public/assets/icons/SVG/search.svg b/public/assets/icons/search.svg similarity index 100% rename from public/assets/icons/SVG/search.svg rename to public/assets/icons/search.svg diff --git a/public/assets/icons/selection.json b/public/assets/icons/selection.json deleted file mode 100644 index 702a5f4b14..0000000000 --- a/public/assets/icons/selection.json +++ /dev/null @@ -1,280 +0,0 @@ -{ - "IcoMoonType": "selection", - "icons": [ - { - "icon": { - "paths": [ - "M512 805.55c-26.327 0-342.253-547.2-329.090-570s645.016-22.8 658.179-0c13.164 22.8-302.762 570-329.090 570z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "drop" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 19, - "id": 7, - "name": "drop", - "prevSize": 32 - }, - "setIdx": 0, - "setId": 2, - "iconIdx": 0 - }, - { - "icon": { - "paths": [ - "M150.491 934.135c-116.86-120.578-114.682-315.022 2.772-435.162l419.52-429.122c88.632-90.664 232.702-90.672 321.342 0 87.78 89.788 87.886 234.658 0 324.552l-417.641 364.199c-65.543 53.085-129.017 51.74-167.78 2.15-33.528-45.039-37.804-108.2 14.538-172.073l280.797-301.566c45.47-42.173 96.611 14.055 62.886 52.611l-279.123 305.55c-26.641 29.134 9.166 68.62 37.223 42.869l377.607-383.225c39.226-40.124 39.226-105.45-0.022-145.596-38.378-39.254-99.914-39.274-138.308 0l-419.522 429.12c-73.712 74.417-50.951 185.648 12.504 243.531 115.358 116.571 241.769 10.637 390.752-118.085 12.354-12.638 162.427-159.298 229.85-220.758 28.821-19.79 58.368 7.804 38.427 49.734l-310.083 374.386c-124.54 135.441-338.085 138.288-455.739 16.886z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "attach" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 12, - "id": 6, - "name": "attach", - "prevSize": 32 - }, - "setIdx": 0, - "setId": 2, - "iconIdx": 1 - }, - { - "icon": { - "paths": [ - "M512.643 246.995c0-0 0-0.107 0.008-0.32s0.014-0.532 0.033-0.957c0.018-0.425 0.047-0.955 0.090-1.59s0.099-1.373 0.174-2.214c0.075-0.841 0.169-1.784 0.286-2.826s0.258-2.185 0.426-3.424c0.168-1.239 0.364-2.575 0.592-4.004s0.487-2.952 0.783-4.564c0.296-1.612 0.627-3.313 0.999-5.099s0.784-3.657 1.24-5.607c0.456-1.951 0.956-3.982 1.503-6.087s1.142-4.286 1.788-6.535c0.646-2.249 1.343-4.567 2.094-6.949s1.556-4.825 2.418-7.326c0.862-2.501 1.781-5.058 2.761-7.665s2.018-5.264 3.119-7.965c1.101-2.7 2.264-5.444 3.492-8.223s2.519-5.594 3.877-8.438c1.358-2.844 2.782-5.716 4.274-8.609s3.051-5.808 4.68-8.736c1.629-2.928 3.326-5.87 5.093-8.817s3.605-5.901 5.512-8.852c1.908-2.951 3.886-5.901 5.935-8.841s4.169-5.871 6.359-8.785c2.19-2.914 4.452-5.809 6.783-8.682s4.733-5.719 7.205-8.534c2.471-2.815 5.013-5.597 7.622-8.339 2.61-2.745 5.288-5.448 8.034-8.105 2.745-2.659 5.558-5.269 8.437-7.827s5.822-5.061 8.83-7.504c3.008-2.446 6.079-4.829 9.211-7.145 3.132-2.318 6.326-4.569 9.578-6.749 3.252-2.178 6.563-4.283 9.929-6.312 3.368-2.027 6.789-3.978 10.265-5.844 3.474-1.866 7.002-3.648 10.578-5.344 3.577-1.694 7.202-3.299 10.873-4.814 3.671-1.512 7.387-2.932 11.145-4.254 3.758-1.324 7.557-2.55 11.393-3.674s7.709-2.149 11.616-3.068c3.907-0.921 7.844-1.735 11.812-2.443 3.968-0.71 7.962-1.311 11.98-1.803 4.019-0.492 8.061-0.877 12.121-1.147 4.059-0.273 8.138-0.432 12.229-0.481 4.092-0.047 8.197 0.019 12.309 0.198 4.113 0.177 8.233 0.468 12.355 0.874 4.122 0.409 8.248 0.929 12.37 1.564 4.122 0.632 8.242 1.382 12.353 2.245 4.111 0.861 8.214 1.84 12.302 2.927 4.090 1.090 8.162 2.292 12.218 3.609 4.055 1.314 8.090 2.74 12.1 4.278 4.010 1.535 7.993 3.182 11.947 4.936 3.953 1.756 7.875 3.619 11.761 5.589 3.888 1.967 7.736 4.043 11.543 6.221s7.574 4.46 11.292 6.84c3.718 2.381 7.389 4.863 11.006 7.439 3.617 2.579 7.183 5.253 10.69 8.022s6.955 5.628 10.342 8.578c3.387 2.951 6.709 5.992 9.964 9.117 3.254 3.125 6.44 6.336 9.555 9.624 3.114 3.291 6.157 6.666 9.121 10.114 2.964 3.45 5.85 6.975 8.656 10.573 2.804 3.598 5.528 7.268 8.166 11.005s5.189 7.542 7.652 11.409c2.463 3.867 4.835 7.797 7.115 11.785s4.465 8.034 6.555 12.133c2.090 4.099 4.084 8.251 5.977 12.452s3.686 8.45 5.379 12.742c1.692 4.293 3.28 8.629 4.764 13.004s2.865 8.789 4.137 13.238c1.272 4.448 2.438 8.931 3.495 13.444s2.006 9.055 2.844 13.623c0.838 4.568 1.566 9.161 2.183 13.775s1.122 9.25 1.514 13.902c0.394 4.653 0.676 9.322 0.844 14.005 0.17 4.683 0.225 9.379 0.17 14.084-0.057 4.705-0.225 9.42-0.507 14.141-0.28 4.721-0.674 9.448-1.179 14.177-0.507 4.729-1.124 9.462-1.852 14.194s-1.566 9.463-2.514 14.191c-0.947 4.728-2.004 9.453-3.17 14.172s-2.438 9.432-3.817 14.138c-1.379 4.705-2.865 9.402-4.454 14.089s-3.28 9.363-5.075 14.027c-1.793 4.664-3.688 9.316-5.679 13.954-1.992 4.638-4.084 9.263-6.269 13.872s-4.467 9.203-6.839 13.78c-2.372 4.577-4.835 9.138-7.385 13.681s-5.191 9.069-7.913 13.577c-2.722 4.508-5.528 8.997-8.414 13.468s-5.85 8.922-8.89 13.355c-3.040 4.433-6.157 8.846-9.342 13.24-3.187 4.394-6.442 8.769-9.764 13.124s-6.709 8.691-10.157 13.007c-3.448 4.316-6.957 8.613-10.519 12.89-3.564 4.277-7.183 8.535-10.852 12.774-3.671 4.239-7.389 8.459-11.153 12.66s-7.574 8.384-11.422 12.549c-3.848 4.165-7.736 8.311-11.658 12.439-3.92 4.128-7.875 8.239-11.858 12.333s-7.995 8.17-12.027 12.228c-4.035 4.062-8.090 8.102-12.163 12.13-4.073 4.025-8.162 8.037-12.264 12.031s-8.214 7.975-12.332 11.938c-4.118 3.963-8.242 7.912-12.366 11.847-4.124 3.931-8.248 7.85-12.366 11.755-4.12 3.903-8.233 7.793-12.336 11.67-4.103 3.874-8.197 7.735-12.273 11.584-4.076 3.846-8.138 7.678-12.18 11.498-4.040 3.817-8.060 7.624-12.052 11.412-3.995 3.791-7.962 7.566-11.9 11.329-3.939 3.762-7.846 7.509-11.719 11.24-3.873 3.734-7.709 7.452-11.507 11.152-3.798 3.703-7.557 7.39-11.271 11.061-3.716 3.671-7.387 7.327-11.012 10.964-3.625 3.64-7.202 7.259-10.73 10.866-3.526 3.604-7.002 7.189-10.424 10.756s-6.789 7.114-10.099 10.642c-3.31 3.528-6.563 7.038-9.756 10.525s-6.326 6.95-9.397 10.392c-3.071 3.442-6.079 6.859-9.022 10.254-2.943 3.393-5.822 6.762-8.635 10.103s-5.558 6.656-8.236 9.942c-2.678 3.286-5.288 6.544-7.829 9.77-2.541 3.229-5.013 6.424-7.414 9.585-2.402 3.164-4.733 6.292-6.994 9.388-2.261 3.094-4.452 6.151-6.571 9.172s-4.168 6.005-6.147 8.948c-1.978 2.943-3.886 5.844-5.723 8.703s-3.604 5.678-5.302 8.448c-1.698 2.771-3.326 5.495-4.886 8.175-1.56 2.677-3.051 5.308-4.476 7.886s-2.782 5.108-4.074 7.585c-1.292 2.474-2.519 4.897-3.683 7.265s-2.264 4.678-3.303 6.931c-1.039 2.253-2.018 4.447-2.938 6.583-0.92 2.134-1.782 4.207-2.587 6.216-0.806 2.011-1.556 3.96-2.254 5.841s-1.343 3.7-1.939 5.448c-0.596 1.748-1.142 3.432-1.643 5.045-0.501 1.611-0.956 3.154-1.369 4.626s-0.784 2.873-1.117 4.199c-0.333 1.327-0.627 2.581-0.888 3.76s-0.487 2.282-0.684 3.312c-0.197 1.028-0.364 1.98-0.505 2.854s-0.258 1.67-0.353 2.388c-0.095 0.721-0.169 1.361-0.227 1.92-0.058 0.562-0.099 1.043-0.129 1.447-0.030 0.401-0.047 0.723-0.058 0.963-0.010 0.242-0.014 0.403-0.014 0.484s0 0.081 0 0-0.008-0.242-0.014-0.484c-0.010-0.239-0.028-0.562-0.058-0.963-0.030-0.403-0.071-0.885-0.128-1.447-0.058-0.559-0.132-1.199-0.227-1.92-0.095-0.718-0.211-1.514-0.353-2.388s-0.309-1.827-0.505-2.854c-0.197-1.030-0.423-2.134-0.684-3.312s-0.555-2.433-0.888-3.76c-0.333-1.327-0.704-2.729-1.117-4.199-0.413-1.473-0.868-3.016-1.369-4.626-0.501-1.613-1.047-3.297-1.643-5.045s-1.241-3.567-1.939-5.448c-0.698-1.881-1.448-3.83-2.254-5.841-0.806-2.009-1.668-4.082-2.587-6.216-0.92-2.136-1.898-4.33-2.938-6.583s-2.14-4.564-3.303-6.931c-1.164-2.368-2.391-4.79-3.683-7.265-1.292-2.477-2.65-5.006-4.074-7.585s-2.916-5.209-4.476-7.886c-1.56-2.677-3.188-5.404-4.886-8.175s-3.465-5.589-5.302-8.448c-1.837-2.859-3.745-5.761-5.723-8.703s-4.027-5.927-6.147-8.948c-2.12-3.021-4.31-6.078-6.571-9.172s-4.593-6.224-6.994-9.388c-2.402-3.161-4.873-6.356-7.414-9.585-2.541-3.226-5.151-6.484-7.829-9.77s-5.424-6.601-8.236-9.942c-2.812-3.341-5.691-6.71-8.635-10.103-2.943-3.396-5.952-6.812-9.022-10.254s-6.204-6.905-9.397-10.392c-3.193-3.487-6.446-6.997-9.756-10.525s-6.678-7.075-10.099-10.642c-3.421-3.567-6.897-7.153-10.424-10.756-3.526-3.606-7.104-7.226-10.729-10.866-3.625-3.637-7.297-7.293-11.012-10.964s-7.474-7.358-11.272-11.061c-3.798-3.7-7.635-7.418-11.508-11.152-3.872-3.731-7.78-7.478-11.718-11.24s-7.906-7.538-11.9-11.329c-3.994-3.788-8.014-7.595-12.054-11.412-4.040-3.82-8.102-7.652-12.179-11.498-4.077-3.848-8.169-7.709-12.272-11.584-4.103-3.877-8.218-7.767-12.336-11.67-4.12-3.905-8.244-7.824-12.368-11.755-4.124-3.934-8.248-7.884-12.366-11.847-4.116-3.963-8.229-7.944-12.33-11.938s-8.191-8.006-12.264-12.031c-4.075-4.028-8.13-8.069-12.163-12.13-4.035-4.059-8.046-8.135-12.027-12.228-3.983-4.093-7.94-8.204-11.86-12.333-3.922-4.128-7.808-8.275-11.656-12.439-3.85-4.164-7.658-8.347-11.422-12.549s-7.484-8.421-11.153-12.66c-3.669-4.239-7.288-8.497-10.852-12.774s-7.073-8.574-10.521-12.89c-3.448-4.316-6.835-8.652-10.157-13.007s-6.578-8.73-9.763-13.124c-3.187-4.394-6.301-8.807-9.342-13.24s-6.006-8.885-8.892-13.355c-2.886-4.471-5.692-8.96-8.414-13.468s-5.36-9.034-7.913-13.577c-2.551-4.543-5.014-9.104-7.385-13.681s-4.652-9.171-6.839-13.78c-2.185-4.609-4.275-9.233-6.267-13.872s-3.888-9.29-5.68-13.954c-1.793-4.664-3.486-9.341-5.075-14.027s-3.073-9.384-4.452-14.089c-1.379-4.705-2.653-9.418-3.817-14.138-1.166-4.719-2.223-9.444-3.172-14.172s-1.787-9.46-2.514-14.191c-0.728-4.732-1.345-9.464-1.85-14.194-0.507-4.73-0.899-9.456-1.181-14.177-0.28-4.721-0.45-9.436-0.507-14.141-0.056-4.706 0-9.401 0.17-14.084s0.45-9.352 0.844-14.005c0.392-4.652 0.899-9.288 1.516-13.902 0.615-4.615 1.345-9.207 2.183-13.775s1.787-9.11 2.842-13.623c1.057-4.512 2.223-8.995 3.497-13.444 1.272-4.448 2.652-8.862 4.135-13.238s3.074-8.711 4.766-13.004c1.692-4.293 3.486-8.542 5.379-12.742s3.886-8.353 5.976-12.452c2.090-4.099 4.276-8.145 6.557-12.133 2.278-3.988 4.652-7.918 7.113-11.785 2.463-3.867 5.016-7.672 7.652-11.409 2.638-3.737 5.362-7.407 8.168-11.005 2.804-3.598 5.692-7.122 8.656-10.573 2.964-3.448 6.004-6.822 9.119-10.114s6.301-6.5 9.557-9.624c3.254-3.125 6.578-6.167 9.963-9.117 3.387-2.951 6.837-5.81 10.344-8.578s7.071-5.443 10.69-8.022c3.617-2.578 7.288-5.058 11.006-7.439 3.716-2.381 7.482-4.663 11.29-6.84s7.658-4.254 11.544-6.221c3.886-1.97 7.808-3.833 11.763-5.589 3.953-1.754 7.938-3.401 11.947-4.936 4.010-1.538 8.044-2.964 12.098-4.278 4.056-1.317 8.13-2.519 12.218-3.609 4.088-1.088 8.191-2.066 12.302-2.927 4.111-0.864 8.231-1.613 12.353-2.245 4.122-0.635 8.248-1.155 12.37-1.564 4.124-0.406 8.244-0.697 12.357-0.874 4.113-0.18 8.216-0.245 12.308-0.198 4.091 0.049 8.17 0.211 12.23 0.481s8.102 0.656 12.12 1.147c4.018 0.492 8.013 1.093 11.981 1.803 3.967 0.708 7.906 1.522 11.812 2.443 3.906 0.918 7.78 1.944 11.616 3.068s7.635 2.352 11.393 3.674c3.758 1.322 7.474 2.742 11.145 4.254 3.671 1.514 7.297 3.12 10.873 4.814 3.577 1.696 7.104 3.479 10.579 5.344s6.897 3.817 10.264 5.844c3.367 2.029 6.678 4.134 9.93 6.312 3.252 2.18 6.446 4.431 9.578 6.749 3.133 2.316 6.203 4.699 9.211 7.145 3.008 2.443 5.951 4.946 8.83 7.504s5.691 5.167 8.437 7.827c2.746 2.657 5.424 5.36 8.034 8.105 2.61 2.742 5.151 5.524 7.622 8.339s4.873 5.662 7.205 8.534c2.332 2.873 4.593 5.768 6.783 8.682s4.31 5.844 6.359 8.785c2.049 2.94 4.027 5.89 5.935 8.841s3.745 5.905 5.512 8.852c1.767 2.947 3.465 5.889 5.093 8.817s3.188 5.843 4.68 8.736c1.492 2.894 2.916 5.766 4.274 8.609s2.65 5.659 3.877 8.438c1.228 2.779 2.39 5.523 3.491 8.223s2.14 5.358 3.119 7.965c0.979 2.607 1.898 5.165 2.761 7.665s1.667 4.945 2.418 7.326c0.751 2.381 1.448 4.699 2.094 6.949s1.241 4.429 1.788 6.535c0.548 2.105 1.047 4.136 1.503 6.087s0.868 3.821 1.24 5.607c0.372 1.786 0.704 3.487 1 5.099s0.555 3.134 0.783 4.564c0.228 1.429 0.423 2.765 0.591 4.004s0.309 2.382 0.426 3.424c0.117 1.043 0.211 1.986 0.286 2.826s0.132 1.579 0.174 2.214c0.042 0.635 0.070 1.165 0.090 1.59 0.018 0.425 0.028 0.744 0.033 0.957 0.008 0.213 0.008 0.319 0.008 0.32z" - ], - "attrs": [ - { - "opacity": 0.995434 - } - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "heart" - ] - }, - "attrs": [ - { - "opacity": 0.995434 - } - ], - "properties": { - "order": 13, - "id": 5, - "name": "heart", - "prevSize": 32 - }, - "setIdx": 0, - "setId": 2, - "iconIdx": 2 - }, - { - "icon": { - "paths": [ - "M455.198 936.403c47.348-23.941 93.073-68.957 110.437-108.727 26.454-60.589 34.176-58.161-184.999-58.161-215.82 0-235.164-3.665-274.971-52.094-19.508-23.734-20.246-34.762-20.246-302.603 0-269.511 0.634-278.824 20.831-305.968 38.409-51.62 54.371-53.73 406.398-53.73 352.147 0 366.603 1.988 406.736 55.924 18.108 24.337 19.199 41.596 19.199 303.775 0 267.841-0.738 278.87-20.246 302.603-29.076 35.373-68.764 52.094-123.647 52.094-42.607 0-48.558 2.486-53.801 22.48-7.969 30.385-49.908 76.645-93.191 102.792-43.613 26.347-155.935 60.432-197.311 59.875l-30.488-0.41zM630.413 658.301c38.187-17.52 75.047-73.879 84.079-128.558 4.321-26.16 5.61-49.714 2.864-52.342-9.841-9.417-176.272-4.887-176.272 4.798 0 5.267-5.957 38.744 1.604 56.061 9.934 22.752 33.006 10.649 51.44 13.065 15.884 2.082 24.538 10.752 11.255 27.994-11.637 15.105-25.279 18.495-73.352 18.228-51.154-0.284-68.643-5.521-89.102-23.52-22.644-19.921-23.285-35.519-26.441-102.032-4.264-89.855 6.423-106.172 75.493-115.262 57.282-7.539 116.41 3.493 132.484 37.253 9.565 20.089 6.219 23.677 41.916 23.677 49.276 0 52.572-13.633 33.516-63.728-12.332-32.416-23.229-24.637-9.097-53.137 24.446-49.3 19.382-83.757-18.057-122.851-36.843-38.473-53.256-35.788-35.268 5.768 6.459 14.924 10.319 39.064 8.576 53.645-2.466 20.631-8.728 27.13-28.236 29.3-13.95 1.552-30.601-3.592-37.544-11.597-14.378-16.579-40.412-18.78-55.163-4.664-7.082 6.777-17.935 6.332-35.832-1.472-21.618-9.426-28.616-8.646-44.303 4.94-10.246 8.874-28.806 14.755-41.243 13.069-19.961-2.706-22.55-7.961-22.071-44.815 0.298-22.963 4.037-49.057 8.309-57.987 13.232-27.662-19.107-19.15-46.769 12.309-29.106 33.102-34.235 94.012-10.632 126.261 13.012 17.777 2.662 20.624-4.635 60.051-35.157 189.982 1.283 260.622 96.593 297.734 62.369 24.286 150.219 23.352 205.888-2.188z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "logo" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 14, - "id": 4, - "name": "logo", - "prevSize": 32 - }, - "setIdx": 0, - "setId": 2, - "iconIdx": 3 - }, - { - "icon": { - "paths": [ - "M30.643 497.901l166.484-326.299c15.964-37.452 55.824-96.382 96.493-25.564l29.86 51.997c330.525-102.659 567.148 37.712 627.628 220.288 38.641 116.649 29.5 283.871-54.76 444.762-21.208 30.541-48.711 10.071-44.011-17.019 100.043-375.463-215.787-547.457-380.227-334.976l25.935 63.671c16.571 40.683-20.47 49.305-88.935 37.14l-346.503-48.754c-28.297-7.433-43.45-38.296-31.963-65.247z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "msg" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 15, - "id": 3, - "name": "reply", - "prevSize": 32 - }, - "setIdx": 0, - "setId": 2, - "iconIdx": 4 - }, - { - "icon": { - "paths": [ - "M71.111 403.214h879.891c39.017 0 70.646 31.629 70.646 70.646v40.406c0 39.017-31.629 70.646-70.646 70.646h-879.891c-39.017 0-70.646-31.629-70.646-70.646v-40.406c0-39.017 31.629-70.646 70.646-70.646z", - "M71.111 697.168h879.891c39.017 0 70.646 31.629 70.646 70.646v40.406c0 39.017-31.629 70.646-70.646 70.646h-879.891c-39.017 0-70.646-31.629-70.646-70.646v-40.406c0-39.017 31.629-70.646 70.646-70.646z", - "M71.111 109.26h879.891c39.017 0 70.646 31.629 70.646 70.646v40.406c0 39.017-31.629 70.646-70.646 70.646h-879.891c-39.017 0-70.646-31.629-70.646-70.646v-40.406c0-39.017 31.629-70.646 70.646-70.646z" - ], - "attrs": [ - {}, - {}, - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "options" - ] - }, - "attrs": [ - {}, - {}, - {} - ], - "properties": { - "order": 16, - "id": 2, - "name": "menu", - "prevSize": 32 - }, - "setIdx": 0, - "setId": 2, - "iconIdx": 5 - }, - { - "icon": { - "paths": [ - "M541.767 724.078c29.252-17.514 61.792-7.909 74.389 24.391l17.412 54.291 193.311 2.783c50.117 1.103 82.080-53.637 56.467-96.7l-53.152-89.364c-6.775-11.391-27.791-34.946-3.013-49.684l68.757-40.896c23.693-14.092 37.491 13.756 44.267 25.147l53.047 89.187c77.021 129.494-18.735 293.417-169.245 290.104l-194.406 10.788-22.108 50.163c-14.549 24.445-35.378 33.502-71.84 16.325l-148.056-120.732c-12.221-12.769-12.225-43.152 0.541-55.371z", - "M639.95 449.723c-29.916-16.355-38.111-49.278-16.639-76.497l37.997-42.508-95.494-168.1c-24.428-43.775-87.817-43.615-111.979 0.278l-50.141 91.087c-6.392 11.611-16.061 41.661-41.317 27.758l-70.083-38.579c-24.15-13.294-7.125-39.295-0.733-50.906l50.042-90.907c72.658-131.991 262.5-132.433 335.862-0.972l107.751 162.173 54.451-6.339c28.446 0.166 46.804 13.541 50.457 53.68l-29.13 188.807c-4.822 17.005-31.019 32.394-48.020 27.574z", - "M351.040 499.271c0.165 34.094-24.68 57.199-58.891 51.58l-55.587-12.681-100.893 164.916c-26.486 42.561 4.329 97.956 54.433 97.859l103.976-0.201c13.254-0.026 44.23-6.106 44.286 22.724l0.154 80c0.053 27.567-30.939 25.25-44.193 25.276l-103.77 0.2c-150.668 0.291-242.924-165.627-163.383-293.445l89.775-172.774-31.898-44.583c-13.62-24.974-10.8-47.511 22.558-70.133l179.323-65.877c17.214-4.009 43.359 11.469 47.369 28.679z" - ], - "attrs": [ - {}, - {}, - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "recycle" - ] - }, - "attrs": [ - {}, - {}, - {} - ], - "properties": { - "order": 17, - "id": 1, - "name": "recycle", - "prevSize": 32 - }, - "setIdx": 0, - "setId": 2, - "iconIdx": 6 - }, - { - "icon": { - "paths": [ - "M365.456 19.998c-183.688 0-332.597 148.909-332.598 332.597l-0 0c0 183.688 148.909 332.597 332.597 332.598l0 0c77.902-0.001 149.549-26.784 206.234-71.644l-0.695 0.531 22.906 23.363c-9.96 18.527-7.184 42.273 8.195 57.855l288.68 292.492c18.43 18.673 47.759 18.338 65.758-0.75l20.828-22.090c17.999-19.088 17.652-49.487-0.777-68.16l-288.68-292.496c-15.071-15.27-37.43-17.822-54.922-7.809l-20.629-21.043c53.162-58.723 85.698-136.985 85.699-222.847l0-0c-0-183.688-148.909-332.597-332.597-332.598l-0-0zM365.456 125.834c0.001-0 0.002-0 0.003-0 125.237 0 226.762 101.525 226.763 226.762l0 0c-0.001 125.237-101.526 226.762-226.763 226.762-0.001 0-0.002-0-0.003-0l0 0c-125.237-0.001-226.761-101.525-226.762-226.762l-0-0c0.001-125.237 101.525-226.761 226.762-226.762l-0 0z" - ], - "attrs": [ - {} - ], - "isMulticolor": false, - "isMulticolor2": false, - "grid": 0, - "tags": [ - "search" - ] - }, - "attrs": [ - {} - ], - "properties": { - "order": 18, - "id": 0, - "name": "search", - "prevSize": 32 - }, - "setIdx": 0, - "setId": 2, - "iconIdx": 7 - } - ], - "height": 1024, - "preferences": { - "showGlyphs": true, - "showQuickUse": true, - "showQuickUse2": true, - "showSVGs": true, - "fontPref": { - "prefix": "icon-", - "metadata": { - "fontFamily": "icomoon" - }, - "metrics": { - "emSize": 1024, - "baseline": 6.25, - "whitespace": 50 - }, - "embed": false - }, - "imagePref": { - "prefix": "icon-", - "png": false, - "useClassSelector": true, - "color": 0, - "bgColor": 16777215, - "classSelector": ".icon", - "name": "social", - "height": 32, - "columns": 16, - "margin": 16, - "sprite": true - }, - "historySize": 50, - "showCodes": true, - "gridSize": 16 - } -} \ No newline at end of file diff --git a/public/assets/icons/sprite/sprite.css b/public/assets/icons/sprite/sprite.css deleted file mode 100644 index 588e331945..0000000000 --- a/public/assets/icons/sprite/sprite.css +++ /dev/null @@ -1,46 +0,0 @@ -.icon { - display: inline-block; - background-repeat: no-repeat; - background-image: url(sprite.svg); -} -.icon-drop { - width: 32px; - height: 32px; - background-position: 0 0; -} -.icon-attach { - width: 32px; - height: 32px; - background-position: -48px 0; -} -.icon-heart { - width: 32px; - height: 32px; - background-position: -96px 0; -} -.icon-logo { - width: 32px; - height: 32px; - background-position: -144px 0; -} -.icon-reply { - width: 32px; - height: 32px; - background-position: -192px 0; -} -.icon-menu { - width: 32px; - height: 32px; - background-position: -240px 0; -} -.icon-recycle { - width: 32px; - height: 32px; - background-position: -288px 0; -} -.icon-search { - width: 32px; - height: 32px; - background-position: -336px 0; -} - diff --git a/public/assets/icons/sprite/sprite.html b/public/assets/icons/sprite/sprite.html deleted file mode 100644 index d7bb557f52..0000000000 --- a/public/assets/icons/sprite/sprite.html +++ /dev/null @@ -1,104 +0,0 @@ - - - - CSS Sprite - - - - - - - -
-

CSS Sprite - Generated by IcoMoon

-
-
-

Grid Size: 0

-
- - icon-drop -
-
- - icon-attach -
-
- - icon-heart -
-
- - icon-logo -
-
- - icon-reply -
-
- - icon-menu -
-
- - icon-recycle -
-
- - icon-search -
-
- - - diff --git a/public/assets/icons/sprite/sprite.svg b/public/assets/icons/sprite/sprite.svg deleted file mode 100644 index 11bb14ddbe..0000000000 --- a/public/assets/icons/sprite/sprite.svg +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/public/assets/icons/style.css b/public/assets/icons/style.css deleted file mode 100644 index 88d42fe36e..0000000000 --- a/public/assets/icons/style.css +++ /dev/null @@ -1,16 +0,0 @@ -.icon { - display: inline-block; - width: 1em; - height: 1em; - stroke-width: 0; - stroke: currentColor; - fill: currentColor; -} - -/* ========================================== -Single-colored icons can be modified like so: -.icon-name { - font-size: 32px; - color: red; -} -========================================== */ diff --git a/public/assets/icons/svgxuse.js b/public/assets/icons/svgxuse.js deleted file mode 100644 index 245217c76e..0000000000 --- a/public/assets/icons/svgxuse.js +++ /dev/null @@ -1,230 +0,0 @@ -/*! - * @copyright Copyright (c) 2017 IcoMoon.io - * @license Licensed under MIT license - * See https://github.com/Keyamoon/svgxuse - * @version 1.2.6 - */ -/*jslint browser: true */ -/*global XDomainRequest, MutationObserver, window */ -(function () { - "use strict"; - if (typeof window !== "undefined" && window.addEventListener) { - var cache = Object.create(null); // holds xhr objects to prevent multiple requests - var checkUseElems; - var tid; // timeout id - var debouncedCheck = function () { - clearTimeout(tid); - tid = setTimeout(checkUseElems, 100); - }; - var unobserveChanges = function () { - return; - }; - var observeChanges = function () { - var observer; - window.addEventListener("resize", debouncedCheck, false); - window.addEventListener("orientationchange", debouncedCheck, false); - if (window.MutationObserver) { - observer = new MutationObserver(debouncedCheck); - observer.observe(document.documentElement, { - childList: true, - subtree: true, - attributes: true - }); - unobserveChanges = function () { - try { - observer.disconnect(); - window.removeEventListener("resize", debouncedCheck, false); - window.removeEventListener("orientationchange", debouncedCheck, false); - } catch (ignore) {} - }; - } else { - document.documentElement.addEventListener("DOMSubtreeModified", debouncedCheck, false); - unobserveChanges = function () { - document.documentElement.removeEventListener("DOMSubtreeModified", debouncedCheck, false); - window.removeEventListener("resize", debouncedCheck, false); - window.removeEventListener("orientationchange", debouncedCheck, false); - }; - } - }; - var createRequest = function (url) { - // In IE 9, cross origin requests can only be sent using XDomainRequest. - // XDomainRequest would fail if CORS headers are not set. - // Therefore, XDomainRequest should only be used with cross origin requests. - function getOrigin(loc) { - var a; - if (loc.protocol !== undefined) { - a = loc; - } else { - a = document.createElement("a"); - a.href = loc; - } - return a.protocol.replace(/:/g, "") + a.host; - } - var Request; - var origin; - var origin2; - if (window.XMLHttpRequest) { - Request = new XMLHttpRequest(); - origin = getOrigin(location); - origin2 = getOrigin(url); - if (Request.withCredentials === undefined && origin2 !== "" && origin2 !== origin) { - Request = XDomainRequest || undefined; - } else { - Request = XMLHttpRequest; - } - } - return Request; - }; - var xlinkNS = "http://www.w3.org/1999/xlink"; - checkUseElems = function () { - var base; - var bcr; - var fallback = ""; // optional fallback URL in case no base path to SVG file was given and no symbol definition was found. - var hash; - var href; - var i; - var inProgressCount = 0; - var isHidden; - var Request; - var url; - var uses; - var xhr; - function observeIfDone() { - // If done with making changes, start watching for chagnes in DOM again - inProgressCount -= 1; - if (inProgressCount === 0) { // if all xhrs were resolved - unobserveChanges(); // make sure to remove old handlers - observeChanges(); // watch for changes to DOM - } - } - function attrUpdateFunc(spec) { - return function () { - if (cache[spec.base] !== true) { - spec.useEl.setAttributeNS(xlinkNS, "xlink:href", "#" + spec.hash); - if (spec.useEl.hasAttribute("href")) { - spec.useEl.setAttribute("href", "#" + spec.hash); - } - } - }; - } - function onloadFunc(xhr) { - return function () { - var body = document.body; - var x = document.createElement("x"); - var svg; - xhr.onload = null; - x.innerHTML = xhr.responseText; - svg = x.getElementsByTagName("svg")[0]; - if (svg) { - svg.setAttribute("aria-hidden", "true"); - svg.style.position = "absolute"; - svg.style.width = 0; - svg.style.height = 0; - svg.style.overflow = "hidden"; - body.insertBefore(svg, body.firstChild); - } - observeIfDone(); - }; - } - function onErrorTimeout(xhr) { - return function () { - xhr.onerror = null; - xhr.ontimeout = null; - observeIfDone(); - }; - } - unobserveChanges(); // stop watching for changes to DOM - // find all use elements - uses = document.getElementsByTagName("use"); - for (i = 0; i < uses.length; i += 1) { - try { - bcr = uses[i].getBoundingClientRect(); - } catch (ignore) { - // failed to get bounding rectangle of the use element - bcr = false; - } - href = uses[i].getAttribute("href") - || uses[i].getAttributeNS(xlinkNS, "href") - || uses[i].getAttribute("xlink:href"); - if (href && href.split) { - url = href.split("#"); - } else { - url = ["", ""]; - } - base = url[0]; - hash = url[1]; - isHidden = bcr && bcr.left === 0 && bcr.right === 0 && bcr.top === 0 && bcr.bottom === 0; - if (bcr && bcr.width === 0 && bcr.height === 0 && !isHidden) { - // the use element is empty - // if there is a reference to an external SVG, try to fetch it - // use the optional fallback URL if there is no reference to an external SVG - if (fallback && !base.length && hash && !document.getElementById(hash)) { - base = fallback; - } - if (uses[i].hasAttribute("href")) { - uses[i].setAttributeNS(xlinkNS, "xlink:href", href); - } - if (base.length) { - // schedule updating xlink:href - xhr = cache[base]; - if (xhr !== true) { - // true signifies that prepending the SVG was not required - setTimeout(attrUpdateFunc({ - useEl: uses[i], - base: base, - hash: hash - }), 0); - } - if (xhr === undefined) { - Request = createRequest(base); - if (Request !== undefined) { - xhr = new Request(); - cache[base] = xhr; - xhr.onload = onloadFunc(xhr); - xhr.onerror = onErrorTimeout(xhr); - xhr.ontimeout = onErrorTimeout(xhr); - xhr.open("GET", base); - xhr.send(); - inProgressCount += 1; - } - } - } - } else { - if (!isHidden) { - if (cache[base] === undefined) { - // remember this URL if the use element was not empty and no request was sent - cache[base] = true; - } else if (cache[base].onload) { - // if it turns out that prepending the SVG is not necessary, - // abort the in-progress xhr. - cache[base].abort(); - delete cache[base].onload; - cache[base] = true; - } - } else if (base.length && cache[base]) { - setTimeout(attrUpdateFunc({ - useEl: uses[i], - base: base, - hash: hash - }), 0); - } - } - } - uses = ""; - inProgressCount += 1; - observeIfDone(); - }; - var winLoad; - winLoad = function () { - window.removeEventListener("load", winLoad, false); // to prevent memory leaks - tid = setTimeout(checkUseElems, 0); - }; - if (document.readyState !== "complete") { - // The load event fires when all resources have finished loading, which allows detecting whether SVG use elements are empty. - window.addEventListener("load", winLoad, false); - } else { - // No need to add a listener if the document is already loaded, initialize immediately. - winLoad(); - } - } -}()); diff --git a/public/assets/icons/symbol-defs.svg b/public/assets/icons/symbol-defs.svg deleted file mode 100644 index 09a59f06a1..0000000000 --- a/public/assets/icons/symbol-defs.svg +++ /dev/null @@ -1,32 +0,0 @@ - diff --git a/src/Controller/FaqHome.php b/src/Controller/FaqHome.php deleted file mode 100644 index e12ae85709..0000000000 --- a/src/Controller/FaqHome.php +++ /dev/null @@ -1,101 +0,0 @@ -. -// }}} - -/** - * FAQ main page - * - * @package GNUsocial - * @category Controller - * - * @author Eliseu Amaro - * @copyright 2020 Free Software Foundation, Inc http://www.fsf.org - * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later - */ - -namespace App\Controller; - -use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; -use Symfony\Component\Routing\Annotation\Route; - -class FaqHome extends AbstractController -{ - /** - * @Route("/doc/faq", name="doc_faq") - */ - public function home() - { - return $this->render('faq/home.html.twig'); - } - - /** - * @Route("/doc/help", name="doc_help") - */ - public function help() - { - return $this->render('faq/help.html.twig'); - } - - /** - * @Route("/doc/about", name="doc_about") - */ - public function about() - { - return $this->render('faq/about.html.twig'); - } - - /** - * @Route("/doc/contact", name="doc_contact") - */ - public function contact() - { - return $this->render('faq/contact.html.twig'); - } - - /** - * @Route("/doc/tags", name="doc_tags") - */ - public function tags() - { - return $this->render('faq/tags.html.twig'); - } - - /** - * @Route("/doc/groups", name="doc_groups") - */ - public function groups() - { - return $this->render('faq/groups.html.twig'); - } - - /** - * @Route("/doc/api", name="doc_api") - */ - public function api() - { - return $this->render('faq/api.html.twig'); - } - - /** - * @Route("/doc/openid", name="doc_openid") - */ - public function openid() - { - return $this->render('faq/openid.html.twig'); - } -} \ No newline at end of file diff --git a/src/Routes/Main.php b/src/Routes/Main.php index cccd3e556e..7cb1ca97ea 100644 --- a/src/Routes/Main.php +++ b/src/Routes/Main.php @@ -30,14 +30,31 @@ namespace App\Routes; +<<<<<<< HEAD use App\Controller as C; use App\Core\Router\RouteLoader; +======= +use App\Controller\NetworkPublic; +use App\Core\RouteLoader; +use Symfony\Bundle\FrameworkBundle\Controller\TemplateController; +>>>>>>> 5734468448... [UI] Better use of icons, fixing static pages routing. abstract class Main { public static function load(RouteLoader $r): void { +<<<<<<< HEAD $r->connect('main_all', '/main/all', C\NetworkPublic::class); $r->connect('config_admin', '/config/admin', C\AdminConfigController::class); +======= + $r->connect('main_all', '/main/all', NetworkPublic::class); + + // FAQ pages, still need to make sure no path traversal attacks or sql and stuff + $r->connect('doc_faq', '/doc/faq', TemplateController::class, [], ['defaults' => ['template' => 'faq/home.html.twig']]); + $r->connect('doc_contact', '/doc/contact', TemplateController::class, [], ['defaults' => ['template' => 'faq/contact.html.twig']]); + $r->connect('doc_tags', '/doc/tags', TemplateController::class, [], ['defaults' => ['template' => 'faq/tags.html.twig']]); + $r->connect('doc_groups', '/doc/groups', TemplateController::class, [], ['defaults' => ['template' => 'faq/groups.html.twig']]); + $r->connect('doc_openid', '/doc/openid', TemplateController::class, [], ['defaults' => ['template' => 'faq/openid.html.twig']]); +>>>>>>> 5734468448... [UI] Better use of icons, fixing static pages routing. } } diff --git a/templates/base.html.twig b/templates/base.html.twig index 25add4c763..47406b1ed5 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -27,42 +27,94 @@ {% endblock %}
- {% block header %}{% endblock %} + {% block header %} + + {% endblock %} {% block nav %}{% endblock %} {% block body %}{% endblock %}
diff --git a/templates/faq/base.html.twig b/templates/faq/base.html.twig index 74457f902d..011c42d635 100644 --- a/templates/faq/base.html.twig +++ b/templates/faq/base.html.twig @@ -10,62 +10,6 @@ {% endblock %} -{% block header %} - -{% endblock %} +{% block header %}{{ parent() }}{% endblock %} {% block javascripts %}{% endblock %}