Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Customizable footer revamp (pages & topics) #12592

Merged
merged 76 commits into from May 16, 2024
Merged

Customizable footer revamp (pages & topics) #12592

Changes from 12 commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
581802e
extration of not_hidden method from proposal applied to debates inclu…
greenwoodt Feb 28, 2024
0eca885
returned to normal
greenwoodt Feb 28, 2024
b7bf8e0
Merge branch 'develop' of https://github.com/decidim/decidim into dev…
greenwoodt Feb 29, 2024
c58b5ae
Merge branch 'develop' of https://github.com/decidim/decidim into dev…
greenwoodt Mar 1, 2024
80b1bcd
Merge branch 'develop' of https://github.com/decidim/decidim into dev…
greenwoodt Mar 5, 2024
907968e
Merge branch 'develop' of https://github.com/decidim/decidim into dev…
greenwoodt Mar 5, 2024
276f69c
Merge branch 'develop' of https://github.com/decidim/decidim into dev…
greenwoodt Mar 6, 2024
52e8578
Merge branch 'develop' of https://github.com/decidim/decidim into dev…
greenwoodt Mar 7, 2024
b6eaadc
Merge branch 'develop' of https://github.com/decidim/decidim into dev…
greenwoodt Mar 12, 2024
4ba2f2f
Merge branch 'develop' of https://github.com/decidim/decidim into dev…
greenwoodt Mar 13, 2024
1a2e22b
Merge branch 'develop' of https://github.com/decidim/decidim into dev…
greenwoodt Mar 14, 2024
000f53e
duplicate terms of service link removed
greenwoodt Mar 14, 2024
dec18ef
pushing changes until discussion on functionaliuty takes place
greenwoodt Mar 14, 2024
e866a6c
solution for pages without topic to appear in the footer
greenwoodt Mar 14, 2024
898ff44
removal of i18n unused string
greenwoodt Mar 14, 2024
65c4d87
removal of the help section in the footer
greenwoodt Mar 19, 2024
11843aa
reverting the extraction of the cell utilising the pages variable in …
greenwoodt Mar 19, 2024
195f5e2
Merge branch 'decidim:develop' into fix/footer-terms-of-service-links
greenwoodt Mar 19, 2024
2770bb6
removal of show in footer in pages including removal of attribute fro…
greenwoodt Mar 21, 2024
d2cc34a
Merge branch 'fix/footer-terms-of-service-links' of github.com:greenw…
greenwoodt Mar 21, 2024
6941da9
change title of static generated page in footer
greenwoodt Mar 21, 2024
4709cd2
revert changes accroding to PR
greenwoodt Mar 22, 2024
85cb14b
removal of column show_in_footer and update of cell to iterate only t…
greenwoodt Mar 26, 2024
7877523
rubocop issues fixed
greenwoodt Mar 26, 2024
f45895e
Update decidim-core/db/migrate/20240326104215_remove_show_in_footer_i…
greenwoodt Apr 4, 2024
6e70ed0
Update decidim-core/app/cells/decidim/footer_topics_cell.rb
greenwoodt Apr 4, 2024
430ea84
Update decidim-core/app/views/layouts/decidim/footer/_main.html.erb
greenwoodt Apr 4, 2024
57c361a
Update decidim-core/app/cells/decidim/footer_topics_cell.rb
greenwoodt Apr 4, 2024
92abbb8
Update decidim-core/app/cells/decidim/footer_topics_cell.rb
greenwoodt Apr 4, 2024
056e7aa
changes based on second review
greenwoodt Apr 4, 2024
cdf2a64
Merge branch 'fix/footer-terms-of-service-links' of github.com:greenw…
greenwoodt Apr 4, 2024
6a8ce81
Revert "changes based on second review"
greenwoodt Apr 4, 2024
02bfca2
changes to the code base based on review
greenwoodt Apr 4, 2024
2f9695d
Update decidim-core/app/cells/decidim/footer_topics_cell.rb
greenwoodt Apr 9, 2024
1dfc16f
moving resources to end of nav grid
greenwoodt Apr 16, 2024
1e0107c
renaming terms and conditions to terms of service i18n translation
greenwoodt Apr 16, 2024
343c037
gap shortened between columns and generated links in main links
greenwoodt Apr 16, 2024
bdf9373
guard clause to replicate logic in creating new topic in footer
greenwoodt Apr 16, 2024
120b44a
update to tests removal of show_in_footer and menu_spec
greenwoodt Apr 16, 2024
a663019
removal of show_in_footer variable from tests
greenwoodt Apr 16, 2024
fef17c6
lint code fix
greenwoodt Apr 16, 2024
7d4c5c3
Merge branch 'decidim:develop' into fix/footer-terms-of-service-links
greenwoodt Apr 16, 2024
f44aaf8
change to organisation status true
greenwoodt Apr 16, 2024
95c692d
Merge branch 'fix/footer-terms-of-service-links' of github.com:greenw…
greenwoodt Apr 18, 2024
d186096
test to fix broken blocks
greenwoodt Apr 18, 2024
4b4c722
changes to static page tests
greenwoodt Apr 18, 2024
3a5e028
Merge branch 'decidim:develop' into fix/footer-terms-of-service-links
greenwoodt Apr 18, 2024
64c0613
test for changes
greenwoodt Apr 22, 2024
a6485a3
Merge branch 'fix/footer-terms-of-service-links' of github.com:greenw…
greenwoodt Apr 22, 2024
05220aa
lint code fix
greenwoodt Apr 22, 2024
6791617
Merge branch 'decidim:develop' into fix/footer-terms-of-service-links
greenwoodt Apr 22, 2024
cf226c3
changed factory to show_in_footer and edited static_page block to dis…
greenwoodt Apr 23, 2024
9f4800e
changes to tests for static topics to adapt to functionality
greenwoodt Apr 24, 2024
8507fa1
fix lint
greenwoodt Apr 24, 2024
37329ad
Merge branch 'decidim:develop' into fix/footer-terms-of-service-links
greenwoodt Apr 24, 2024
aa1ce2a
Merge branch 'decidim:develop' into fix/footer-terms-of-service-links
greenwoodt May 8, 2024
91b36ec
Update decidim-core/app/views/layouts/decidim/footer/_main_legal.html…
greenwoodt May 8, 2024
16e2eb5
update to footer order with topic utilised to the right
greenwoodt May 8, 2024
b11da61
inverting the column header and topic title
greenwoodt May 9, 2024
ce5f887
updated seed of topic pages to be added by default
greenwoodt May 9, 2024
cf2d5d9
Merge branch 'decidim:develop' into fix/footer-terms-of-service-links
greenwoodt May 9, 2024
4f9a289
Update decidim-core/app/cells/decidim/footer_topics/show.erb
greenwoodt May 15, 2024
7c45f36
Update decidim-core/app/cells/decidim/footer_topics/show.erb
greenwoodt May 15, 2024
f16885c
moved cell to main-links partial
greenwoodt May 15, 2024
08a5b6b
Merge branch 'fix/footer-terms-of-service-links' of github.com:greenw…
greenwoodt May 15, 2024
cfada8f
docmentation added to footer_topics_cell
greenwoodt May 15, 2024
2544b28
remove div from show
greenwoodt May 15, 2024
78d067a
update to release notes about the footer pages
greenwoodt May 15, 2024
fcf3a97
spelling corrected
greenwoodt May 15, 2024
177cccc
changes to RELEASE-NOTES
greenwoodt May 15, 2024
3e61542
spelling
greenwoodt May 15, 2024
4d19ef0
Update decidim-core/app/views/layouts/decidim/footer/_main_links.html…
greenwoodt May 16, 2024
b225125
Update decidim-core/app/cells/decidim/footer_topics_cell.rb
greenwoodt May 16, 2024
82183ae
Update RELEASE_NOTES.md
greenwoodt May 16, 2024
633f0b1
added an extra line in release notes about duplicate TOS link
greenwoodt May 16, 2024
f3ca59f
Added dashes instead of asterisks in the releasenotes
greenwoodt May 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions decidim-core/app/views/layouts/decidim/footer/_main_legal.html.erb
View file
Open in desktop
@@ -1,8 +1,5 @@
<ul class="flex flex-col md:flex-row gap-10 text-sm text-white [&_a]:underline">
<%= cell("decidim/footer_pages", :pages) %>
<li>
<%= link_to t("layouts.decidim.footer.terms_and_conditions"), decidim.page_path("terms-and-conditions") %>
</li>
<li>
<a href="#" data-dialog-open="dc-modal"><%= t("layouts.decidim.footer.data_consent_settings") %></a>
</li>
Expand Down