consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

130 Commits

Author SHA1 Message Date
Javi Martín
24359f8152 Remove extra space in HTML tags 2019-09-10 20:02:15 +02:00
Javi Martín
71d9ddd849 Apply rule to end files with a newline character 2019-09-10 20:02:15 +02:00
Javi Martín
cf9e36c767 Replace single quotes with double quotes 
Most of these quotes were in the dashboard branch before we added the
rule for double quotes.
 2019-09-10 19:21:03 +02:00
taitus
37f20198da Add setting_name param to others calls to _setting_table partial 
In these cases "setting" is the value expected by the new helper method for
everything to continue rendering in the usual way.

Note:
All the new calls to _setting_table partial will need add setting_name param.
 2019-07-29 13:10:09 +02:00
Senén Rodero Rodríguez
b2d8851bcc Add the option to disable languages managment to cover special cases 
We understand languages management as the ability to add new languages
or remove existing ones. When no option is passed it will allow language
manipulation by default.

There are 3 special places where we want block languages management:
- admin legislation processes homepage
- admin legislation processes milestones summary
- proposals retired form

Co-Authored-By: Sebastia <sebastia.roig@gmail.com>
 2019-07-01 15:03:48 +02:00
taitus
0602a38742 Fix Style: Display Titles without highlight 2019-07-01 15:03:48 +02:00
taitus
220a5fc684 Align admin site customization pages form fields with new translations interface 2019-07-01 15:03:48 +02:00
Senén Rodero Rodríguez
146c09adb7 Update references to new translation interface 2019-07-01 14:49:43 +02:00
Alberto
ac1d8195f2 Merge pull request #3488 from consul/basic-yml 
Admin basic customization texts
 2019-05-21 21:43:07 +02:00
decabeza
a2cb7501f7 Create new basic tab for admin information texts 2019-05-21 14:06:58 +02:00
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