comfortable_mexican_sofa 2.0.1 → 2.0.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +1 -1
- data/app/assets/stylesheets/comfy/admin/cms/base.sass +1 -1
- data/app/controllers/comfy/admin/cms/revisions/base_controller.rb +47 -0
- data/app/controllers/comfy/admin/cms/revisions/layout_controller.rb +15 -0
- data/app/controllers/comfy/admin/cms/revisions/page_controller.rb +22 -0
- data/app/controllers/comfy/admin/cms/revisions/snippet_controller.rb +15 -0
- data/app/controllers/comfy/admin/cms/revisions/translation_controller.rb +23 -0
- data/app/views/comfy/admin/cms/layouts/edit.html.haml +2 -2
- data/app/views/comfy/admin/cms/pages/edit.html.haml +3 -4
- data/app/views/comfy/admin/cms/revisions/_sidebar.html.haml +2 -0
- data/app/views/comfy/admin/cms/revisions/show.html.haml +2 -3
- data/app/views/comfy/admin/cms/snippets/edit.html.haml +2 -3
- data/app/views/comfy/admin/cms/translations/_sidebar.html.haml +1 -1
- data/app/views/comfy/admin/cms/translations/edit.html.haml +3 -4
- data/config/environments/development.rb +2 -0
- data/config/environments/test.rb +2 -0
- data/config/locales/cs.yml +7 -12
- data/config/locales/da.yml +7 -12
- data/config/locales/de.yml +7 -12
- data/config/locales/en.yml +7 -12
- data/config/locales/es.yml +7 -12
- data/config/locales/fr.yml +7 -12
- data/config/locales/it.yml +7 -12
- data/config/locales/ja.yml +7 -12
- data/config/locales/nb.yml +7 -12
- data/config/locales/nl.yml +7 -12
- data/config/locales/pl.yml +7 -12
- data/config/locales/pt-BR.yml +7 -12
- data/config/locales/ru.yml +7 -12
- data/config/locales/sk.yml +7 -12
- data/config/locales/sv.yml +7 -12
- data/config/locales/tr.yml +7 -12
- data/config/locales/uk.yml +7 -12
- data/config/locales/zh-CN.yml +7 -12
- data/config/locales/zh-TW.yml +7 -12
- data/lib/comfortable_mexican_sofa/routes/cms_admin.rb +19 -14
- data/lib/comfortable_mexican_sofa/version.rb +1 -1
- data/test/controllers/comfy/admin/cms/revisions/layout_controller_test.rb +62 -0
- data/test/controllers/comfy/admin/cms/revisions/page_controller_test.rb +87 -0
- data/test/controllers/comfy/admin/cms/revisions/snippet_controller_test.rb +59 -0
- data/test/controllers/comfy/admin/cms/revisions/translation_controller_test.rb +69 -0
- data/test/gemfiles/Gemfile.rails.5.2 +1 -21
- data/test/integration/access_control_test.rb +9 -9
- metadata +12 -4
- data/app/controllers/comfy/admin/cms/revisions_controller.rb +0 -67
- data/test/controllers/comfy/admin/cms/revisions_controller_test.rb +0 -248
data/config/locales/es.yml
CHANGED
@@ -110,12 +110,6 @@ es:
|
|
110
110
|
title: Nuevo Diseño
|
111
111
|
edit:
|
112
112
|
title: Editando Diseño
|
113
|
-
revision: &revision
|
114
|
-
zero: No Revisions
|
115
|
-
one: '%{count} Revision'
|
116
|
-
few: '%{count} Revisions'
|
117
|
-
many: '%{count} Revisions'
|
118
|
-
other: '%{count} Revisions'
|
119
113
|
form:
|
120
114
|
select_parent_layout: Seleccionar diseño padre
|
121
115
|
select_app_layout: Seleccionar diseño (App)
|
@@ -145,8 +139,6 @@ es:
|
|
145
139
|
title: Nueva Página
|
146
140
|
edit:
|
147
141
|
title: Editando Página
|
148
|
-
revision:
|
149
|
-
<<: *revision
|
150
142
|
form:
|
151
143
|
select_target_page: No Redirigir
|
152
144
|
preview: Vista Previa
|
@@ -171,8 +163,6 @@ es:
|
|
171
163
|
title: New Translation
|
172
164
|
edit:
|
173
165
|
title: Editing Translation
|
174
|
-
revision:
|
175
|
-
<<: *revision
|
176
166
|
form:
|
177
167
|
preview: Preview
|
178
168
|
create: Create
|
@@ -201,8 +191,6 @@ es:
|
|
201
191
|
title: Nuevo Fragmento
|
202
192
|
edit:
|
203
193
|
title: Editando Fragmento
|
204
|
-
revision:
|
205
|
-
<<: *revision
|
206
194
|
form:
|
207
195
|
create: Crear Fragmento
|
208
196
|
cancel: Cancelar
|
@@ -222,6 +210,13 @@ es:
|
|
222
210
|
changes: Changes
|
223
211
|
previous: Previous
|
224
212
|
current: Corriente
|
213
|
+
sidebar:
|
214
|
+
revision:
|
215
|
+
zero: No Revisions
|
216
|
+
one: '%{count} Revision'
|
217
|
+
few: '%{count} Revisions'
|
218
|
+
many: '%{count} Revisions'
|
219
|
+
other: '%{count} Revisions'
|
225
220
|
|
226
221
|
files:
|
227
222
|
created: Archivos subidos
|
data/config/locales/fr.yml
CHANGED
@@ -110,12 +110,6 @@ fr:
|
|
110
110
|
title: Nouvelle mise en page
|
111
111
|
edit:
|
112
112
|
title: Modification de la mise en page
|
113
|
-
revision: &revision
|
114
|
-
zero: No Revisions
|
115
|
-
one: '%{count} Revision'
|
116
|
-
few: '%{count} Revisions'
|
117
|
-
many: '%{count} Revisions'
|
118
|
-
other: '%{count} Revisions'
|
119
113
|
form:
|
120
114
|
select_parent_layout: Sélectionner une mise en page parent
|
121
115
|
select_app_layout: Sélectionner une mise en page de l'application
|
@@ -145,8 +139,6 @@ fr:
|
|
145
139
|
title: Nouvelle page
|
146
140
|
edit:
|
147
141
|
title: Modification de la page
|
148
|
-
revision:
|
149
|
-
<<: *revision
|
150
142
|
form:
|
151
143
|
select_target_page: Pas de redirection
|
152
144
|
preview: Prévisualiser
|
@@ -171,8 +163,6 @@ fr:
|
|
171
163
|
title: New Translation
|
172
164
|
edit:
|
173
165
|
title: Editing Translation
|
174
|
-
revision:
|
175
|
-
<<: *revision
|
176
166
|
form:
|
177
167
|
preview: Preview
|
178
168
|
create: Create
|
@@ -201,8 +191,6 @@ fr:
|
|
201
191
|
title: Nouveau fragment
|
202
192
|
edit:
|
203
193
|
title: Modification du fragment
|
204
|
-
revision:
|
205
|
-
<<: *revision
|
206
194
|
form:
|
207
195
|
create: Créer le fragment
|
208
196
|
cancel: Annuler
|
@@ -222,6 +210,13 @@ fr:
|
|
222
210
|
changes: Changes
|
223
211
|
previous: Previous
|
224
212
|
current: Actuel
|
213
|
+
sidebar:
|
214
|
+
revision:
|
215
|
+
zero: No Revisions
|
216
|
+
one: '%{count} Revision'
|
217
|
+
few: '%{count} Revisions'
|
218
|
+
many: '%{count} Revisions'
|
219
|
+
other: '%{count} Revisions'
|
225
220
|
|
226
221
|
files:
|
227
222
|
created: Fichier téléchargé
|
data/config/locales/it.yml
CHANGED
@@ -110,12 +110,6 @@ it:
|
|
110
110
|
title: Nuovo Layout
|
111
111
|
edit:
|
112
112
|
title: Modifica Layout
|
113
|
-
revision: &revision
|
114
|
-
zero: '%{count} Revisioni'
|
115
|
-
one: '%{count} Revisione'
|
116
|
-
few: '%{count} Revisioni'
|
117
|
-
many: '%{count} Revisioni'
|
118
|
-
other: '%{count} Revisioni'
|
119
113
|
form:
|
120
114
|
select_parent_layout: Seleziona Layout padre
|
121
115
|
select_app_layout: Seleziona Layout applicazione
|
@@ -145,8 +139,6 @@ it:
|
|
145
139
|
title: Nuova Pagina
|
146
140
|
edit:
|
147
141
|
title: Modifica Pagina
|
148
|
-
revision:
|
149
|
-
<<: *revision
|
150
142
|
form:
|
151
143
|
select_target_page: Nessun reindirizzamento
|
152
144
|
preview: Anteprima
|
@@ -171,8 +163,6 @@ it:
|
|
171
163
|
title: New Translation
|
172
164
|
edit:
|
173
165
|
title: Editing Translation
|
174
|
-
revision:
|
175
|
-
<<: *revision
|
176
166
|
form:
|
177
167
|
preview: Preview
|
178
168
|
create: Create
|
@@ -201,8 +191,6 @@ it:
|
|
201
191
|
title: Nuovo Snippet
|
202
192
|
edit:
|
203
193
|
title: Modifica Snippet
|
204
|
-
revision:
|
205
|
-
<<: *revision
|
206
194
|
form:
|
207
195
|
create: Crea Snippet
|
208
196
|
cancel: Cancellare
|
@@ -222,6 +210,13 @@ it:
|
|
222
210
|
changes: Cambiamenti
|
223
211
|
previous: Precedente
|
224
212
|
current: Attuale
|
213
|
+
sidebar:
|
214
|
+
revision:
|
215
|
+
zero: '%{count} Revisioni'
|
216
|
+
one: '%{count} Revisione'
|
217
|
+
few: '%{count} Revisioni'
|
218
|
+
many: '%{count} Revisioni'
|
219
|
+
other: '%{count} Revisioni'
|
225
220
|
|
226
221
|
files:
|
227
222
|
created: File caricati
|
data/config/locales/ja.yml
CHANGED
@@ -110,12 +110,6 @@ ja:
|
|
110
110
|
title: 新規レイアウト
|
111
111
|
edit:
|
112
112
|
title: レイアウトを編集
|
113
|
-
revision: &revision
|
114
|
-
zero: リビジョン
|
115
|
-
one: '%{count} リビジョン'
|
116
|
-
few: '%{count} リビジョン'
|
117
|
-
many: '%{count} リビジョン'
|
118
|
-
other: '%{count} リビジョン'
|
119
113
|
form:
|
120
114
|
select_parent_layout: 親レイアウトを選択
|
121
115
|
select_app_layout: アプリケーションレイアウトを選択
|
@@ -145,8 +139,6 @@ ja:
|
|
145
139
|
title: 新規ページ
|
146
140
|
edit:
|
147
141
|
title: ページを編集
|
148
|
-
revision:
|
149
|
-
<<: *revision
|
150
142
|
form:
|
151
143
|
select_target_page: リダイレクトなし
|
152
144
|
preview: プレビュー
|
@@ -171,8 +163,6 @@ ja:
|
|
171
163
|
title: New Translation
|
172
164
|
edit:
|
173
165
|
title: Editing Translation
|
174
|
-
revision:
|
175
|
-
<<: *revision
|
176
166
|
form:
|
177
167
|
preview: Preview
|
178
168
|
create: Create
|
@@ -201,8 +191,6 @@ ja:
|
|
201
191
|
title: 新規スニペット
|
202
192
|
edit:
|
203
193
|
title: スニペットを編集
|
204
|
-
revision:
|
205
|
-
<<: *revision
|
206
194
|
form:
|
207
195
|
create: スニペットを作成
|
208
196
|
cancel: キャンセル
|
@@ -222,6 +210,13 @@ ja:
|
|
222
210
|
changes: Changes
|
223
211
|
previous: Previous
|
224
212
|
current: Current
|
213
|
+
sidebar:
|
214
|
+
revision: &revision
|
215
|
+
zero: リビジョン
|
216
|
+
one: '%{count} リビジョン'
|
217
|
+
few: '%{count} リビジョン'
|
218
|
+
many: '%{count} リビジョン'
|
219
|
+
other: '%{count} リビジョン'
|
225
220
|
|
226
221
|
files:
|
227
222
|
created: ファイルがアップロードされました
|
data/config/locales/nb.yml
CHANGED
@@ -110,12 +110,6 @@ nb:
|
|
110
110
|
title: Ny layout
|
111
111
|
edit:
|
112
112
|
title: Endrer layout
|
113
|
-
revision: &revision
|
114
|
-
zero: Ingen revisjoner
|
115
|
-
one: '%{count} revisjon'
|
116
|
-
few: '%{count} revisjoner'
|
117
|
-
many: '%{count} revisjoner'
|
118
|
-
other: '%{count} revisjoner'
|
119
113
|
form:
|
120
114
|
select_parent_layout: Velg hovedlayout
|
121
115
|
select_app_layout: Velg applikasjonslayout
|
@@ -145,8 +139,6 @@ nb:
|
|
145
139
|
title: Ny side
|
146
140
|
edit:
|
147
141
|
title: Endrer side
|
148
|
-
revision:
|
149
|
-
<<: *revision
|
150
142
|
form:
|
151
143
|
select_target_page: Ingen videresending
|
152
144
|
preview: Forhåndsvisning
|
@@ -171,8 +163,6 @@ nb:
|
|
171
163
|
title: New Translation
|
172
164
|
edit:
|
173
165
|
title: Editing Translation
|
174
|
-
revision:
|
175
|
-
<<: *revision
|
176
166
|
form:
|
177
167
|
preview: Preview
|
178
168
|
create: Create
|
@@ -201,8 +191,6 @@ nb:
|
|
201
191
|
title: Ny snutt
|
202
192
|
edit:
|
203
193
|
title: Endrer snutt
|
204
|
-
revision:
|
205
|
-
<<: *revision
|
206
194
|
form:
|
207
195
|
create: Oprett snutt
|
208
196
|
cancel: Cancel
|
@@ -222,6 +210,13 @@ nb:
|
|
222
210
|
changes: Endringer
|
223
211
|
previous: Forrige
|
224
212
|
current: Nåværende
|
213
|
+
sidebar:
|
214
|
+
revision:
|
215
|
+
zero: Ingen revisjoner
|
216
|
+
one: '%{count} revisjon'
|
217
|
+
few: '%{count} revisjoner'
|
218
|
+
many: '%{count} revisjoner'
|
219
|
+
other: '%{count} revisjoner'
|
225
220
|
|
226
221
|
files:
|
227
222
|
created: Opplastede filer
|
data/config/locales/nl.yml
CHANGED
@@ -110,12 +110,6 @@ nl:
|
|
110
110
|
title: Nieuwe Lay-out
|
111
111
|
edit:
|
112
112
|
title: Lay-out Bewerken
|
113
|
-
revision: &revision
|
114
|
-
zero: '%{count} Revisies'
|
115
|
-
one: '%{count} Revisie'
|
116
|
-
few: '%{count} Revisies'
|
117
|
-
many: '%{count} Revisies'
|
118
|
-
other: '%{count} Revisies'
|
119
113
|
form:
|
120
114
|
select_parent_layout: Selecteer Ouder Lay-out
|
121
115
|
select_app_layout: Selecteer Applicatie Lay-out
|
@@ -145,8 +139,6 @@ nl:
|
|
145
139
|
title: Nieuwe Pagina
|
146
140
|
edit:
|
147
141
|
title: Pagina Bewerken
|
148
|
-
revision:
|
149
|
-
<<: *revision
|
150
142
|
form:
|
151
143
|
select_target_page: Geen Omleiding
|
152
144
|
preview: Preview
|
@@ -171,8 +163,6 @@ nl:
|
|
171
163
|
title: New Translation
|
172
164
|
edit:
|
173
165
|
title: Editing Translation
|
174
|
-
revision:
|
175
|
-
<<: *revision
|
176
166
|
form:
|
177
167
|
preview: Preview
|
178
168
|
create: Create
|
@@ -201,8 +191,6 @@ nl:
|
|
201
191
|
title: Nieuw Snippet
|
202
192
|
edit:
|
203
193
|
title: Snippet Bewerken
|
204
|
-
revision:
|
205
|
-
<<: *revision
|
206
194
|
form:
|
207
195
|
create: Snippet Aanmaken
|
208
196
|
cancel: Annuleren
|
@@ -222,6 +210,13 @@ nl:
|
|
222
210
|
changes: Changes
|
223
211
|
previous: Previous
|
224
212
|
current: Huidig
|
213
|
+
sidebar:
|
214
|
+
revision:
|
215
|
+
zero: '%{count} Revisies'
|
216
|
+
one: '%{count} Revisie'
|
217
|
+
few: '%{count} Revisies'
|
218
|
+
many: '%{count} Revisies'
|
219
|
+
other: '%{count} Revisies'
|
225
220
|
|
226
221
|
files:
|
227
222
|
created: Bestanden geüpload
|
data/config/locales/pl.yml
CHANGED
@@ -110,12 +110,6 @@ pl:
|
|
110
110
|
title: Nowy szablon
|
111
111
|
edit:
|
112
112
|
title: Edytuj szablon
|
113
|
-
revision: &revision
|
114
|
-
zero: '%{count} Wersji'
|
115
|
-
one: '%{count} Wersja'
|
116
|
-
few: '%{count} Wersje'
|
117
|
-
many: '%{count} Wersji'
|
118
|
-
other: '%{count} Wersje'
|
119
113
|
form:
|
120
114
|
select_parent_layout: Wybierz szablon rodzica
|
121
115
|
select_app_layout: Wybierz szablon aplikacji
|
@@ -145,8 +139,6 @@ pl:
|
|
145
139
|
title: Nowa strona
|
146
140
|
edit:
|
147
141
|
title: Edytuj stronę
|
148
|
-
revision:
|
149
|
-
<<: *revision
|
150
142
|
form:
|
151
143
|
select_target_page: Bez przekierowania
|
152
144
|
preview: Podgląd
|
@@ -171,8 +163,6 @@ pl:
|
|
171
163
|
title: New Translation
|
172
164
|
edit:
|
173
165
|
title: Editing Translation
|
174
|
-
revision:
|
175
|
-
<<: *revision
|
176
166
|
form:
|
177
167
|
preview: Preview
|
178
168
|
create: Create
|
@@ -201,8 +191,6 @@ pl:
|
|
201
191
|
title: Nowy snippet
|
202
192
|
edit:
|
203
193
|
title: Edytuj snippet
|
204
|
-
revision:
|
205
|
-
<<: *revision
|
206
194
|
form:
|
207
195
|
create: Utwórz snippet
|
208
196
|
cancel: Anuluj
|
@@ -222,6 +210,13 @@ pl:
|
|
222
210
|
changes: Wersje
|
223
211
|
previous: Historyczna
|
224
212
|
current: Aktualna
|
213
|
+
sidebar:
|
214
|
+
revision:
|
215
|
+
zero: '%{count} Wersji'
|
216
|
+
one: '%{count} Wersja'
|
217
|
+
few: '%{count} Wersje'
|
218
|
+
many: '%{count} Wersji'
|
219
|
+
other: '%{count} Wersje'
|
225
220
|
|
226
221
|
files:
|
227
222
|
created: Plik wrzucony na serwer
|
data/config/locales/pt-BR.yml
CHANGED
@@ -110,12 +110,6 @@ pt-BR:
|
|
110
110
|
title: Novo Leiaute
|
111
111
|
edit:
|
112
112
|
title: Editando Leiaute
|
113
|
-
revision: &revision
|
114
|
-
zero: '%{count} Revisão'
|
115
|
-
one: '%{count} Revisão'
|
116
|
-
few: '%{count} Revisões'
|
117
|
-
many: '%{count} Revisões'
|
118
|
-
other: '%{count} Revisões'
|
119
113
|
form:
|
120
114
|
select_parent_layout: Selecione o Leiaute Pai
|
121
115
|
select_app_layout: Selecione o Leiaute da Aplicação
|
@@ -145,8 +139,6 @@ pt-BR:
|
|
145
139
|
title: Nova Página
|
146
140
|
edit:
|
147
141
|
title: Editando Página
|
148
|
-
revision:
|
149
|
-
<<: *revision
|
150
142
|
form:
|
151
143
|
select_target_page: Não Redirecionar
|
152
144
|
preview: Pré-visualização
|
@@ -171,8 +163,6 @@ pt-BR:
|
|
171
163
|
title: New Translation
|
172
164
|
edit:
|
173
165
|
title: Editing Translation
|
174
|
-
revision:
|
175
|
-
<<: *revision
|
176
166
|
form:
|
177
167
|
preview: Preview
|
178
168
|
create: Create
|
@@ -201,8 +191,6 @@ pt-BR:
|
|
201
191
|
title: Novo Fragmento
|
202
192
|
edit:
|
203
193
|
title: Editando Fragmento
|
204
|
-
revision:
|
205
|
-
<<: *revision
|
206
194
|
form:
|
207
195
|
create: Criar Fragmento
|
208
196
|
cancel: Cancelar
|
@@ -222,6 +210,13 @@ pt-BR:
|
|
222
210
|
changes: Changes
|
223
211
|
previous: Previous
|
224
212
|
current: Atual
|
213
|
+
sidebar:
|
214
|
+
revision:
|
215
|
+
zero: '%{count} Revisão'
|
216
|
+
one: '%{count} Revisão'
|
217
|
+
few: '%{count} Revisões'
|
218
|
+
many: '%{count} Revisões'
|
219
|
+
other: '%{count} Revisões'
|
225
220
|
|
226
221
|
files:
|
227
222
|
created: Arquivo enviado com sucesso.
|
data/config/locales/ru.yml
CHANGED
@@ -110,12 +110,6 @@ ru:
|
|
110
110
|
title: Новый шаблон
|
111
111
|
edit:
|
112
112
|
title: Редактирование шаблона
|
113
|
-
revision: &revision
|
114
|
-
zero: 'Нет Ревизий'
|
115
|
-
one: '%{count} Ревизия'
|
116
|
-
few: '%{count} Ревизии'
|
117
|
-
many: '%{count} Ревизий'
|
118
|
-
other: '%{count} Ревизии'
|
119
113
|
form:
|
120
114
|
select_parent_layout: Выбрать родительский шаблон
|
121
115
|
select_app_layout: Выбрать шаблон приложения
|
@@ -145,8 +139,6 @@ ru:
|
|
145
139
|
title: Новая страница
|
146
140
|
edit:
|
147
141
|
title: Редактирование страницы
|
148
|
-
revision:
|
149
|
-
<<: *revision
|
150
142
|
form:
|
151
143
|
select_target_page: Без редиректа
|
152
144
|
preview: Предпросмотр
|
@@ -171,8 +163,6 @@ ru:
|
|
171
163
|
title: New Translation
|
172
164
|
edit:
|
173
165
|
title: Editing Translation
|
174
|
-
revision:
|
175
|
-
<<: *revision
|
176
166
|
form:
|
177
167
|
preview: Preview
|
178
168
|
create: Create
|
@@ -201,8 +191,6 @@ ru:
|
|
201
191
|
title: Новый сниппет
|
202
192
|
edit:
|
203
193
|
title: Редактирование сниппета
|
204
|
-
revision:
|
205
|
-
<<: *revision
|
206
194
|
form:
|
207
195
|
create: Создать сниппет
|
208
196
|
cancel: Oтменить
|
@@ -222,6 +210,13 @@ ru:
|
|
222
210
|
changes: Changes
|
223
211
|
previous: Previous
|
224
212
|
current: Текущая
|
213
|
+
sidebar:
|
214
|
+
revision:
|
215
|
+
zero: 'Нет Ревизий'
|
216
|
+
one: '%{count} Ревизия'
|
217
|
+
few: '%{count} Ревизии'
|
218
|
+
many: '%{count} Ревизий'
|
219
|
+
other: '%{count} Ревизии'
|
225
220
|
|
226
221
|
files:
|
227
222
|
created: Файлы загружены
|