coalla-cms 0.4.4.3 → 0.5.1.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -13
- data/Gemfile.lock +91 -84
- data/Rakefile +2 -2
- data/app/assets/javascripts/admin/admin.js +45 -117
- data/app/assets/javascripts/admin/photo_uploader.js +1 -10
- data/app/assets/javascripts/admin/vendor/jquery-ui-timepicker-addon-ru.js +39 -37
- data/app/assets/stylesheets/admin/admin.scss +5 -1
- data/app/controllers/admin/image_upload_controller.rb +1 -1
- data/app/controllers/admin/lookups_controller.rb +9 -4
- data/app/controllers/admin/notifier_controller.rb +7 -0
- data/app/controllers/admin/site_meta_tags_controller.rb +43 -0
- data/app/controllers/concerns/page_meta_tags.rb +71 -0
- data/app/helpers/admin/lookup_helper.rb +23 -0
- data/app/helpers/common_helper.rb +6 -0
- data/app/helpers/lookup_helper.rb +41 -14
- data/app/helpers/twitter_builder_helper.rb +7 -7
- data/app/helpers/twitter_form_builder.rb +9 -3
- data/app/models/lookup.rb +22 -0
- data/app/models/site_meta_tags.rb +16 -0
- data/app/uploaders/meta_tags_image_uploader.rb +5 -0
- data/app/utils/admin_structure.rb +17 -2
- data/app/views/admin/base/_sort.haml +3 -3
- data/app/views/admin/common/_file_upload_template.haml +8 -4
- data/app/views/admin/common/_header.html.haml +5 -4
- data/app/views/admin/common/_image_upload_template.html.haml +1 -1
- data/app/views/admin/common/_slides.html.haml +1 -1
- data/app/views/admin/home/dashboard.html.haml +1 -1
- data/app/views/admin/lookups/_form.html.haml +2 -8
- data/app/views/admin/lookups/edit.html.haml +1 -1
- data/app/views/admin/lookups/index.html.haml +2 -2
- data/app/views/admin/lookups/types/_boolean.haml +1 -0
- data/app/views/admin/lookups/types/_enum.haml +1 -0
- data/app/views/admin/lookups/types/_file.haml +3 -0
- data/app/views/admin/lookups/types/_float.haml +1 -0
- data/app/views/admin/lookups/types/_integer.haml +1 -0
- data/app/views/admin/lookups/types/_memo.haml +1 -0
- data/app/views/admin/lookups/types/_string.haml +1 -0
- data/app/views/admin/lookups/types/_wysiwyg.haml +1 -0
- data/app/views/admin/site_meta_tags/_form.html.haml +22 -0
- data/app/views/admin/site_meta_tags/edit.html.haml +5 -0
- data/app/views/admin/site_meta_tags/index.html.haml +5 -0
- data/app/views/layouts/admin.html.haml +10 -4
- data/app/views/structure/_section.haml +2 -1
- data/coalla-cms.gemspec +2 -0
- data/lib/coalla/cms/version.rb +1 -1
- data/lib/coalla/orm/page_slider.rb +3 -1
- data/lib/coalla/orm/relation.rb +7 -4
- data/lib/generators/coalla/cms/create_admin_administrators_generator.rb +29 -0
- data/lib/generators/coalla/cms/create_markup_generator.rb +30 -0
- data/lib/generators/coalla/cms/init_generator.rb +33 -37
- data/lib/generators/coalla/cms/lookups/install_generator.rb +17 -6
- data/lib/generators/coalla/cms/lookups/templates/migration.rb +4 -0
- data/lib/generators/coalla/cms/market/templates/controllers/products_controller.rb +1 -1
- data/lib/generators/coalla/cms/market/templates/controllers/properties_controller.rb +1 -1
- data/lib/generators/coalla/cms/meta_tags/install_generator.rb +58 -0
- data/lib/generators/coalla/cms/meta_tags/templates/migration.rb +23 -0
- data/lib/generators/coalla/cms/news/templates/views/new.haml.erb +1 -1
- data/lib/generators/coalla/cms/setup_admin_generator.rb +10 -7
- data/lib/generators/coalla/cms/setup_routes_generator.rb +1 -0
- data/lib/generators/coalla/cms/templates/assets.rb +2 -4
- data/lib/generators/coalla/cms/templates/controllers/admin/administrators_controller.rb +55 -0
- data/lib/generators/coalla/cms/templates/controllers/admin/base_controller.rb.erb +2 -2
- data/lib/generators/coalla/cms/templates/controllers/markup_controller.rb.erb +2 -0
- data/lib/generators/coalla/cms/templates/initializers/carrierwave.rb +47 -0
- data/lib/generators/coalla/cms/templates/locales/activerecord.en.yml +16 -0
- data/lib/generators/coalla/cms/templates/locales/activerecord.ru.yml +29 -0
- data/lib/generators/coalla/cms/templates/locales/admin.en.yml +27 -0
- data/lib/generators/coalla/cms/templates/locales/admin.ru.yml +27 -0
- data/lib/generators/coalla/cms/templates/views/admin/administrators/_form.html.haml +9 -0
- data/lib/generators/coalla/cms/templates/views/admin/administrators/edit.html.haml +5 -0
- data/lib/generators/coalla/cms/templates/views/admin/administrators/index.html.haml +15 -0
- data/lib/generators/coalla/cms/templates/views/admin/administrators/new.html.haml +4 -0
- data/lib/generators/coalla/cms/templates/views/admin/scaffold_template/edit.html.haml.erb +1 -1
- data/lib/generators/coalla/cms/templates/views/admin/scaffold_template/new.html.haml.erb +1 -1
- data/lib/generators/coalla/cms/templates/views/administrators/sessions/new.html.haml +3 -3
- metadata +102 -87
- data/lib/generators/coalla/cms/templates/activerecord.ru.yml +0 -13
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-blockquote.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-h1.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-h2.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-h3.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-h4.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-h5.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-h6.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-p.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-pre.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/wymiframe.css +0 -276
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/wymiframe.html +0 -26
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/jquery.wymeditor.js +0 -4819
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/lang/en.js +0 -45
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/lang/ru.js +0 -55
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/plugins/imageupload/icons.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/plugins/imageupload/jquery.wymeditor.imageupload.js +0 -150
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/plugins/resizable/jquery.wymeditor.resizable.js +0 -91
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/plugins/resizable/readme.txt +0 -124
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/compact/icons.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/compact/skin.css +0 -134
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/compact/skin.js +0 -35
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/default/icons.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/default/skin.css +0 -341
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/default/skin.js +0 -40
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/minimal/images/bg.header.gif +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/minimal/images/bg.selector.silver.gif +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/minimal/images/bg.wymeditor.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/minimal/images/icons.silver.gif +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/minimal/skin.css +0 -131
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/minimal/skin.js +0 -30
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/silver/COPYING +0 -674
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/silver/README +0 -27
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/silver/images/bg.header.gif +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/silver/images/bg.selector.silver.gif +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/silver/images/bg.wymeditor.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/silver/images/icons.silver.gif +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/silver/skin.css +0 -297
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/silver/skin.js +0 -61
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/twopanels/icons.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/twopanels/skin.css +0 -134
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/twopanels/skin.js +0 -39
- data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/skins/wymeditor_icon.png +0 -0
- data/lib/generators/coalla/cms/wysiwyg/wymeditor_generator.rb +0 -17
- /data/lib/generators/coalla/cms/templates/{devise.ru.yml → locales/devise.ru.yml} +0 -0
data/lib/generators/coalla/cms/wysiwyg/templates/wymeditor/iframe/default/lbl-blockquote.png
DELETED
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
@@ -1,276 +0,0 @@
|
|
1
|
-
/*
|
2
|
-
* WYMeditor : what you see is What You Mean web-based editor
|
3
|
-
* Copyright (c) 2005 - 2009 Jean-Francois Hovinne, http://www.wymeditor.org/
|
4
|
-
* Dual licensed under the MIT (MIT-license.txt)
|
5
|
-
* and GPL (GPL-license.txt) licenses.
|
6
|
-
*
|
7
|
-
* For further information visit:
|
8
|
-
* http://www.wymeditor.org/
|
9
|
-
*
|
10
|
-
* File Name:
|
11
|
-
* wymeditor.css
|
12
|
-
* Main editor css file.
|
13
|
-
* See the documentation for more info.
|
14
|
-
*
|
15
|
-
* File Authors:
|
16
|
-
* Jean-Francois Hovinne (jf.hovinne a-t wymeditor dotorg)
|
17
|
-
* Daniel Reszka (d.reszka a-t wymeditor dotorg)
|
18
|
-
*/
|
19
|
-
|
20
|
-
/* VISUAL FEEDBACK */
|
21
|
-
|
22
|
-
/* basic */
|
23
|
-
body {
|
24
|
-
background: #f2f2f2;
|
25
|
-
}
|
26
|
-
|
27
|
-
/* make HTML blocs visible */
|
28
|
-
p,
|
29
|
-
h1,
|
30
|
-
h2,
|
31
|
-
h3,
|
32
|
-
h4,
|
33
|
-
h5,
|
34
|
-
h6,
|
35
|
-
ul,
|
36
|
-
ol,
|
37
|
-
table,
|
38
|
-
blockquote,
|
39
|
-
pre {
|
40
|
-
background: #FFFFFF no-repeat 2px 2px;
|
41
|
-
padding: 8px 5px 5px;
|
42
|
-
margin: 10px;
|
43
|
-
}
|
44
|
-
|
45
|
-
td {
|
46
|
-
background: #F0F4F8;
|
47
|
-
}
|
48
|
-
|
49
|
-
th {
|
50
|
-
background: #ffffcc;
|
51
|
-
}
|
52
|
-
|
53
|
-
ul,
|
54
|
-
ol {
|
55
|
-
border-left: 20px solid #B9C4D0;
|
56
|
-
padding: 0px 5px;
|
57
|
-
}
|
58
|
-
|
59
|
-
caption {
|
60
|
-
background: #E4E4B0;
|
61
|
-
padding: 5px;
|
62
|
-
font-weight: bold;
|
63
|
-
}
|
64
|
-
|
65
|
-
table {
|
66
|
-
font-size: 16px;
|
67
|
-
width: 500px;
|
68
|
-
}
|
69
|
-
|
70
|
-
td {
|
71
|
-
width: 25%;
|
72
|
-
}
|
73
|
-
|
74
|
-
blockquote {
|
75
|
-
margin-left: 30px;
|
76
|
-
}
|
77
|
-
|
78
|
-
pre {
|
79
|
-
background-color: transparent;
|
80
|
-
border: 1px solid white;
|
81
|
-
}
|
82
|
-
|
83
|
-
/* Gecko min height fix */
|
84
|
-
p {
|
85
|
-
min-height: 1em;
|
86
|
-
}
|
87
|
-
|
88
|
-
/*min-height is needed under Firefox, because empty parargraphs */
|
89
|
-
*+html p {
|
90
|
-
min-height: auto;
|
91
|
-
}
|
92
|
-
|
93
|
-
/* but we have to remove it under IE7 because it triggers the 'haslayout' mode */
|
94
|
-
td {
|
95
|
-
height: 1.6em;
|
96
|
-
}
|
97
|
-
|
98
|
-
/* labels */
|
99
|
-
p {
|
100
|
-
background-image: url(lbl-p.png);
|
101
|
-
}
|
102
|
-
|
103
|
-
h1 {
|
104
|
-
background-image: url(lbl-h1.png);
|
105
|
-
}
|
106
|
-
|
107
|
-
h2 {
|
108
|
-
background-image: url(lbl-h2.png);
|
109
|
-
}
|
110
|
-
|
111
|
-
h3 {
|
112
|
-
background-image: url(lbl-h3.png);
|
113
|
-
}
|
114
|
-
|
115
|
-
h4 {
|
116
|
-
background-image: url(lbl-h4.png);
|
117
|
-
}
|
118
|
-
|
119
|
-
h5 {
|
120
|
-
background-image: url(lbl-h5.png);
|
121
|
-
}
|
122
|
-
|
123
|
-
h6 {
|
124
|
-
background-image: url(lbl-h6.png);
|
125
|
-
}
|
126
|
-
|
127
|
-
/* === === === === === === === === === */
|
128
|
-
.label,
|
129
|
-
.badge {
|
130
|
-
font-size: 10.998px;
|
131
|
-
font-weight: bold;
|
132
|
-
line-height: 14px;
|
133
|
-
color: #ffffff;
|
134
|
-
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
|
135
|
-
white-space: nowrap;
|
136
|
-
vertical-align: baseline;
|
137
|
-
background-color: #999999;
|
138
|
-
}
|
139
|
-
|
140
|
-
.label {
|
141
|
-
padding: 1px 4px 2px;
|
142
|
-
-webkit-border-radius: 3px;
|
143
|
-
-moz-border-radius: 3px;
|
144
|
-
border-radius: 3px;
|
145
|
-
}
|
146
|
-
|
147
|
-
.badge {
|
148
|
-
padding: 1px 9px 2px;
|
149
|
-
-webkit-border-radius: 9px;
|
150
|
-
-moz-border-radius: 9px;
|
151
|
-
border-radius: 9px;
|
152
|
-
}
|
153
|
-
|
154
|
-
a.label:hover,
|
155
|
-
a.badge:hover {
|
156
|
-
color: #ffffff;
|
157
|
-
text-decoration: none;
|
158
|
-
cursor: pointer;
|
159
|
-
}
|
160
|
-
|
161
|
-
.label-important,
|
162
|
-
.badge-important {
|
163
|
-
background-color: #b94a48;
|
164
|
-
}
|
165
|
-
|
166
|
-
.label-important[href],
|
167
|
-
.badge-important[href] {
|
168
|
-
background-color: #953b39;
|
169
|
-
}
|
170
|
-
|
171
|
-
.label-warning,
|
172
|
-
.badge-warning {
|
173
|
-
background-color: #f89406;
|
174
|
-
}
|
175
|
-
|
176
|
-
.label-warning[href],
|
177
|
-
.badge-warning[href] {
|
178
|
-
background-color: #c67605;
|
179
|
-
}
|
180
|
-
|
181
|
-
.label-success,
|
182
|
-
.badge-success {
|
183
|
-
background-color: #468847;
|
184
|
-
}
|
185
|
-
|
186
|
-
.label-success[href],
|
187
|
-
.badge-success[href] {
|
188
|
-
background-color: #356635;
|
189
|
-
}
|
190
|
-
|
191
|
-
.label-info,
|
192
|
-
.badge-info {
|
193
|
-
background-color: #3a87ad;
|
194
|
-
}
|
195
|
-
|
196
|
-
.label-info[href],
|
197
|
-
.badge-info[href] {
|
198
|
-
background-color: #2d6987;
|
199
|
-
}
|
200
|
-
|
201
|
-
.label-inverse,
|
202
|
-
.badge-inverse {
|
203
|
-
background-color: #333333;
|
204
|
-
}
|
205
|
-
|
206
|
-
.label-inverse[href],
|
207
|
-
.badge-inverse[href] {
|
208
|
-
background-color: #1a1a1a;
|
209
|
-
}
|
210
|
-
/* === === === === === === === === === */
|
211
|
-
|
212
|
-
blockquote {
|
213
|
-
background-image: url(lbl-blockquote.png);
|
214
|
-
}
|
215
|
-
|
216
|
-
/* === === === === === === === === === */
|
217
|
-
blockquote .quote-details,
|
218
|
-
blockquote .quote-actions {
|
219
|
-
margin: 0 0 3px 15px;
|
220
|
-
}
|
221
|
-
blockquote .quote-actions .label {
|
222
|
-
cursor: pointer;
|
223
|
-
}
|
224
|
-
/* === === === === === === === === === */
|
225
|
-
|
226
|
-
pre {
|
227
|
-
background-image: url(lbl-pre.png);
|
228
|
-
}
|
229
|
-
|
230
|
-
/* specific HTML elements */
|
231
|
-
caption {
|
232
|
-
text-align: left;
|
233
|
-
}
|
234
|
-
|
235
|
-
img {
|
236
|
-
margin-right: 5px;
|
237
|
-
border-style: solid;
|
238
|
-
border-color: gray;
|
239
|
-
border-width: 0;
|
240
|
-
}
|
241
|
-
|
242
|
-
a img {
|
243
|
-
border-width: 1px;
|
244
|
-
border-color: blue;
|
245
|
-
}
|
246
|
-
|
247
|
-
acronym {
|
248
|
-
border: 1px solid gray;
|
249
|
-
}
|
250
|
-
|
251
|
-
span {
|
252
|
-
background-color: #eef;
|
253
|
-
}
|
254
|
-
|
255
|
-
/* visual feedback for non-valid nesting of elements*/
|
256
|
-
h1 h1, h1 h2, h1 h3, h1 h4, h1 h5, h1 h6, h1 p, h1 pre, h1 address,
|
257
|
-
h2 h1, h2 h2, h2 h3, h2 h4, h2 h5, h2 h6, h2 p, h2 pre, h2 address,
|
258
|
-
h3 h1, h3 h2, h3 h3, h3 h4, h3 h5, h3 h6, h3 p, h3 pre, h3 address,
|
259
|
-
h4 h1, h4 h2, h4 h3, h4 h4, h4 h5, h4 h6, h4 p, h4 pre, h4 address,
|
260
|
-
h5 h1, h5 h2, h5 h3, h5 h4, h5 h5, h5 h6, h5 p, h5 pre, h5 address,
|
261
|
-
h6 h1, h6 h2, h6 h3, h6 h4, h6 h4, h6 h6, h6 p, h6 pre, h6 address,
|
262
|
-
p h1, p h2, p h3, p h4, p h5, p h6, p pre, p address,
|
263
|
-
pre h1, pre h2, pre h3, pre h4, pre h5, pre h6, pre p, pre pre, pre address,
|
264
|
-
address h1, address h2, address h3, address h4, address h5, address h6,
|
265
|
-
address p, address pre, address address {
|
266
|
-
background-color: #ff9999 !important;
|
267
|
-
border: 1px solid red !important;
|
268
|
-
font-size: 12px !important;
|
269
|
-
font-weight: normal;
|
270
|
-
}
|
271
|
-
|
272
|
-
/* Image title
|
273
|
-
--------------------------------------------------------------------*/
|
274
|
-
.image-title {
|
275
|
-
display: none;
|
276
|
-
}
|
@@ -1,26 +0,0 @@
|
|
1
|
-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
|
2
|
-
<!--
|
3
|
-
* WYMeditor : what you see is What You Mean web-based editor
|
4
|
-
* Copyright (c) 2005 - 2009 Jean-Francois Hovinne, http://www.wymeditor.org/
|
5
|
-
* Dual licensed under the MIT (MIT-license.txt)
|
6
|
-
* and GPL (GPL-license.txt) licenses.
|
7
|
-
*
|
8
|
-
* For further information visit:
|
9
|
-
* http://www.wymeditor.org/
|
10
|
-
*
|
11
|
-
* File Name:
|
12
|
-
* wymiframe.html
|
13
|
-
* Iframe used by designMode.
|
14
|
-
* See the documentation for more info.
|
15
|
-
*
|
16
|
-
* File Authors:
|
17
|
-
* Jean-Francois Hovinne (jf.hovinne a-t wymeditor dotorg)
|
18
|
-
-->
|
19
|
-
<html>
|
20
|
-
<head>
|
21
|
-
<title>WYMeditor iframe</title>
|
22
|
-
<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
|
23
|
-
<link rel="stylesheet" type="text/css" media="screen" href="wymiframe.css" />
|
24
|
-
</head>
|
25
|
-
<body class="wym_iframe"></body>
|
26
|
-
</html>
|