-
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.
* update gemfile * fix translator config * fix translator config * update decidim * update amendments lang on accepting * update amendments lang on accepting * add test for user current locale * add test for user current locale * block chrome version * block chrome version * fix browser * fix browser * fix browser * fix browser * rename interpolations * rename interpolations * fix locale amendment forcing conf * fix locale amendment forcing conf * fix modal login window * fix modal login window * use html formatting for deepl * use html formatting for deepl * use split view by default in amendments * use split view by default in amendments * dont html escape titles * dont html escape titles * default type in proposal filtering * default type in proposal filtering * use around action instead of redirects * use around action instead of redirects * ensure reivew process uses original language too * ensure reivew process uses original language too * overrride extende menu items * overrride extende menu items * allow official proposals to be amended in any language * allow official proposals to be amended in any language * update amendment date * update amendment date * fix amendments acceptation * fix override md5 * fix decidim branch * fix decidim branch * fix decidim branch * fix test
- Loading branch information
1 parent
8643dd2
commit 591a7aa
Showing
28 changed files
with
354 additions
and
222 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <div class="diff-for-<%= data[:label].parameterize %>"> | ||
| <div class="row"> | ||
| <h3 class="section-heading mediumlarge-12 columns"> | ||
| <%= data[:label] %> | ||
| </h3> | ||
| </div> | ||
|
|
||
| <div class="row diff_view diff_view_split" id="attribute-diff-unified-<%= data[:label].parameterize %>-<%= format %>"> | ||
| <%= diff_split(data, "left", format) %> | ||
| <%= diff_split(data, "right", format) %> | ||
| </div> | ||
|
|
||
| <div class="row diff_view diff_view_unified hide" id="attribute-diff-unified-<%= data[:label].parameterize %>-<%= format %>"> | ||
| <%= diff_unified(data, format) %> | ||
| </div> | ||
| </div> |
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,34 @@ | ||
| <div class="diff-view-by show-for-mediumlarge"> | ||
| <div class="diff-view-by__dropdown"> | ||
| <span class="diff-view-by__text"> | ||
| <%= t("versions.dropdown.choose_diff_view_mode") %> | ||
| </span> | ||
|
|
||
| <ul class="dropdown menu" data-dropdown-menu | ||
| data-autoclose="false" | ||
| data-disable-hover="true" | ||
| data-click-open="true" | ||
| data-close-on-click="true" | ||
| role="menubar"> | ||
| <li class="is-dropdown-submenu-parent" role="presentation"> | ||
| <a href="#diffmode-chooser-menu" id="diff-view-selected" aria-controls="diffmode-chooser-menu" aria-haspopup="true" aria-label="<%= t("versions.dropdown.choose_diff_view_mode_menu") %>" role="menuitem"> | ||
| <%= t("versions.dropdown.option_split") %> | ||
| </a> | ||
|
|
||
| <ul class="menu is-dropdown-submenu" id="diffmode-chooser-menu" role="menu" aria-labelledby="diff-view-selected"> | ||
| <li role="presentation"> | ||
| <%= link_to "#diff-view-split", class: "diff-view-mode diff-view-split", id:"diff-view-split", role: "menuitem" do %> | ||
| <%= t("versions.dropdown.option_split") %> | ||
| <% end %> | ||
| </li> | ||
|
|
||
| <li role="presentation"> | ||
| <%= link_to "#diff-view-unified", class: "diff-view-mode diff-view-unified", id:"diff-view-unified", role: "menuitem" do %> | ||
| <%= t("versions.dropdown.option_unified") %> | ||
| <% end %> | ||
| </li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| </div> | ||
| </div> |
Oops, something went wrong.