-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b3f3376
commit 83e84c4
Showing
9 changed files
with
33 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 0 additions & 6 deletions
6
...des/decidim/conferences/conference_program/_program_meeting/add_time_zone.html.erb.deface
This file was deleted.
Oops, something went wrong.
5 changes: 5 additions & 0 deletions
5
...rrides/decidim/conferences/conferences/_conference_hero/external_register.html.erb.deface
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
<!-- replace 'erb[silent]:contains("if current_participatory_space.registrations_enabled?")' --> | ||
|
||
<% if external_conference_registration %> | ||
<%= render "decidim/conferences/external_register_button" %> | ||
<% elsif current_participatory_space.registrations_enabled? %> |
2 changes: 1 addition & 1 deletion
2
app/overrides/decidim/conferences/conferences/show/first_external_register.html.erb.deface
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 7 additions & 11 deletions
18
app/overrides/decidim/conferences/conferences/show/second_external_register.html.erb.deface
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,14 +1,10 @@ | ||
<!-- replace '.columns.mediumlarge-12 > erb[silent]:contains("if current_participatory_space.registrations_enabled?")' --> | ||
<!-- replace 'erb[loud]:contains(":conference_venues") + erb[silent]:contains("if current_participatory_space.registrations_enabled?")' --> | ||
|
||
<% if external_conference_registration %> | ||
<hr class="reset mt-none mb-m"> | ||
<section class="section"> | ||
<h3 class="section-heading"><%= t(".register") %></h3> | ||
<div class="card p-m text-center"> | ||
<p><%= t(".make_conference_registration") %></p> | ||
<div class="medium-3" style="margin: 0 auto;"> | ||
<%= render "decidim/conferences/external_register_button" %> | ||
</div> | ||
</div> | ||
</div> | ||
<section class="content-block"> | ||
<h2 class="h2 decorator"><%= t("decidim.conferences.conferences.show.register") %></h2> | ||
<p class="conference__box-title"><%= t("decidim.conferences.conferences.show.make_conference_registration") %></p> | ||
|
||
<%= render "decidim/conferences/external_register_button" %> | ||
</section> | ||
<% elsif current_participatory_space.registrations_enabled? %> |
7 changes: 0 additions & 7 deletions
7
app/overrides/layouts/decidim/_conference_hero/external_register.html.erb.deface
This file was deleted.
Oops, something went wrong.
2 changes: 1 addition & 1 deletion
2
app/views/decidim/conferences/_external_register_button.html.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
<%= link_to t("layouts.decidim.conference_hero.register"), external_conference_registration, target: "_blank", class:"button button--sc light expanded" %> | ||
<%= link_to t("layouts.decidim.conference_hero.register"), external_conference_registration, target: "_blank", class:"button button__lg button__secondary" %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters