consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,374 Commits 1 Branch 0 Tags
0b437d65fc24128525c9e2173302ef21043cd149
Commit Graph

70 Commits

Author SHA1 Message Date
decabeza
8fda0bfb6c Add help text to slug on admin new site customization pages 2019-05-17 17:41:30 +02:00
decabeza
367c2e7b78 Fix hound warnings 2019-04-30 12:06:56 +02:00
decabeza
1719a8ed28 Adds styles to admin site customization documents 2019-04-30 12:00:59 +02:00
decabeza
62a29e2cf9 Adds missing i18n 2019-04-30 12:00:46 +02:00
voodoorai2000
19b7526421 Add document upload from admin section 2019-04-30 11:59:08 +02:00
Julian Herrero
4df9a1a1b4 Move HTML settings to content blocks settings page 
- Rename html settings keys
- Show html settings next to content blocks page
- Hide html settings from configuration tab
 2019-03-19 19:45:34 +01:00
Julian Herrero
c32a98be10 Use double quotes in app/views/admin/site_customization 2019-03-19 12:16:50 +01:00
decabeza
64cbed838a Fix hound warnings 2019-01-31 17:23:45 +01:00
Alberto
bd4826b25e Merge branch 'master' into add_cards_to_custom_pages 2019-01-28 14:49:39 +01:00
decabeza
045c4eca64 Allow change map image from admin site customization 
Also adds on site customization image.rb jpeg content type to allow replace this image.
 2019-01-24 14:55:01 +01:00
Manu
86d75767e8 change h3 tag to h2 and added title of the custom page which we are adding the cards 2019-01-18 09:54:43 -05:00
Manu
7657a0e0b4 added i18n text to custom pages cards 2019-01-18 09:54:43 -05:00
Manu
722a431b54 Add cards to custom pages 2019-01-18 09:54:43 -05:00
Julian Herrero
d77183ee09 Improvement - CRUD budgets and content blocks 2019-01-14 12:59:48 +01:00
Julian Herrero
fcfee3a906 apply missing requeriments in PR #3043 
In this PR https://github.com/consul/consul/pull/3043
there were some change requests. In order to keep moving
we decided to merge the PR and do the changes ourselves.
 2018-12-11 18:21:14 +01:00
Milber Champutiz Burbano
9f455b9165 Added feature to add content block to headings in sidebar -- rebase 2018-11-27 09:37:35 -05:00
Javi Martín
00983200d4 Update information texts translatable fields 
This part used the code we deleted in order to make it easier to
refactor the rest of the translatable models. Now we add the code back.
 2018-10-22 16:36:12 +02:00
Javi Martín
387b345f77 Refactor globalize_locales partials to increase DRYness 2018-10-22 16:35:01 +02:00
Angel Perez
8bba09aac3 Extract translation logic to helper method 2018-10-22 16:30:32 +02:00
Javi Martín
3b5a12b0ab Don't force translations for the current locale 
Globalize creates a translation for the current locale, and the only way
I've found to change this behaviour is to monkey-patch it.

The original code uses `translation.locale` instead of
`Globalize.locale`. Since `translation.locale` loads the translation
with empty attributes. It both makes the record invalid if there are
validations and it makes it almost impossible to create a record with
translations which don't include the current locale.

See also the following convertations:

https://github.com/globalize/globalize/pull/328
https://github.com/globalize/globalize/issues/468
https://github.com/globalize/globalize/pull/578
https://github.com/shioyama/mobility/wiki/Migrating-from-Globalize#blank-translations
 2018-10-22 16:28:53 +02:00
Javi Martín
124b8496de Simplify methods defining translation styles 
This refactor is going to be useful when we change these rules within
the next few commits.
 2018-10-22 16:28:53 +02:00
Javi Martín
3c170f47d2 Update site customization pages translatable fields 2018-10-22 16:13:48 +02:00
Alberto
3878946c9e Merge pull request #2823 from consul/remove-guides 
Removes guide feature
 2018-10-18 13:19:33 +02:00
Javi Martín
6f96265a0b Bring back CKEditor images button 
It was accidentally deleted in commit 914bfa6.

Note the following spec passes on my machine if we add a `sleep 0.1`
call in the `:wait_readable` part of ruby's `Net::Protocol#rbuf_fill`.
Otherwise, it hangs forever after clicking the `.fileupload-file` div,
which closes its window. It might be solved when upgrading rails,
capybara, selenium or chromedriver.

scenario "Allows images in CKEditor", :js do
  visit edit_admin_site_customization_page_path(custom_page)

  within(".ckeditor") do
    within_frame(0) { expect(page).not_to have_css("img") }

    expect(page).to have_css(".cke_toolbar .cke_button__image_icon")
    find(".cke_toolbar .cke_button__image_icon").click
  end

  within_window(window_opened_by { click_link "Browse Server" }) do
    attach_file :file,
                Rails.root.join('spec/fixtures/files/clippy.jpg'),
                visible: false
    find(".fileupload-file").click
  end

  click_link "OK"

  within(".ckeditor") do
    within_frame(0) { expect(page).to have_css("img") }
  end
end
 2018-10-17 19:39:37 +02:00
decabeza
dbf41421ed Removes guide feature 2018-10-17 14:58:29 +02:00
Papaya Labs
5a4b9b0810 Remove trailing whitespaces 2018-09-27 14:36:23 +02:00
Papaya Labs
914bfa645e Updates translatable custom pages 2018-09-27 13:46:17 +02:00
Raimond Garcia
1fbb428004 Merge pull request #2898 from papayalabs/2889-show-active-tab-in-custom-info-texts 
Show active tab in custom info texts
 2018-09-24 21:11:25 +02:00
Papaya Labs
981281591e Show active tab in custom info texts 2018-09-19 13:20:10 -05:00
Raimond Garcia
ea72cd058b Merge pull request #2876 from javierm/ckeditor4_update 
Ckeditor4 update
 2018-09-17 23:02:50 +02:00
Javi Martín
5faeefab2c Show the image button only if editing admin pages 
That's the only place where we need to attach images so far.
 2018-09-12 12:35:28 +02:00
Marko Lovic
c7fcdd9b0e Use standard locale names for Globalize 
It turns out it is not necessary to downcase and underscore
locale names to use the globalize-accessor gem. The gem
will automatically underscore the locale name when defining and
calling the accessor methods.
 2018-09-11 18:48:14 +02:00
Marko Lovic
7b0aa1e104 Extract merge_translatable_field_options helper method 2018-09-11 18:47:34 +02:00
Marko Lovic
cb716e07d7 Extract translation helper from translatable form views 
So that individual form partials don't depend on the implementation
of how translations are deleted.
 2018-09-10 17:17:47 +02:00
Raimond Garcia
4f2ed27f8c Merge pull request #2865 from consul/backport_1585-make_banners_translatable 
[Backport] Make banners translatable
 2018-09-10 16:41:33 +02:00
Alberto
21f36e6be5 Merge branch 'master' into feature/1-nav-content-blocks 2018-09-05 12:41:07 +02:00
Marko Lovic
bfd9032e9d Extract translation partial to be shared within admin 
Refactor: behaviour should be 100% the same
 2018-08-27 18:24:24 +02:00
decabeza
3fee56e8fe Updates admin site customization specs 2018-07-31 12:55:05 +02:00
decabeza
f77327e93c Unifies styles and views for admin site customization content blocks 2018-07-31 12:54:21 +02:00
decabeza
6727583c0e Unifies styles and views for admin site content section 2018-07-31 12:52:35 +02:00
rgarcia
4c8b174274 Display only translations for the current language 
After creating a translation in spanish, it was also displaying it when selecting
the english locale.

This was due to the code picking the first translation available

With this commit, we are checking for an existing translation in the current locale
and displaying it if it exists
 2018-07-26 21:55:07 -04:00
rgarcia
12f6f06ade Fix exception when using locale as a parameter in the url 
When visiting, for example, /admin/site_customization/information_texts?locale=fr
we were getting an `UncaughtThrowError: uncaught throw :exception`
With the following payload
```
File "/aytomad/app/participa/participacion/releases/20180726231929/app/views/admin/site_customization/information_texts/_form_field.html.erb" line 5

File "/aytomad/app/participa/participacion/releases/20180726231929/app/helpers/globalize_helper.rb" line 35 in block in globalize
```

Substituting this line seems to solve it

Note that we had to remove the portuguese local too, as it was giving a different
exception due to this change. This problem, has been solved in the original
globalization PR
 2018-07-26 21:55:06 -04:00
Angel Perez
26deb02937 Show I18n key on label instead of translation 2018-07-26 20:49:12 -04:00
Angel Perez
ad252ca835 Translations can be updated correctly 2018-07-26 20:49:00 -04:00
rgarcia
82f496ccfa Fix globalization for information texts 
Refactoring and making similar specs to the milestones globalization specs
 2018-07-26 20:48:56 -04:00
Angel Perez
0e82fa72a2 Do not translate original I18n value on label 2018-07-26 19:09:01 -04:00
Angel Perez
079124e3dd Show current translation or I18n value for locale on textarea 2018-07-26 19:08:50 -04:00
Angel Perez
42eb784922 Add specs for basic Admin Globalize feature 2018-07-26 19:08:42 -04:00
Angel Perez
b8b0f64e64 Rename emails key with mailers key 2018-07-26 19:07:28 -04:00
Angel Perez
ca57a65aae Add missing I18n keys for InformationTexts#index view 2018-07-26 19:07:22 -04:00