refinerycms 0.9.4.5 → 0.9.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/README +20 -9
- data/Rakefile +10 -0
- data/bin/refinery +53 -0
- data/bin/refinery-update-core +23 -0
- data/config/environment.rb +2 -2
- data/config/preinitializer.rb +24 -0
- data/public/javascripts/application.js +0 -1
- data/public/javascripts/jquery/jquery.js +4373 -8
- data/public/javascripts/livepipe.js +10 -186
- data/public/javascripts/{admin.js → refinery/admin.js} +0 -0
- data/public/javascripts/{wymeditor → refinery}/boot_wym.js +0 -0
- data/public/javascripts/{dialog.js → refinery/dialog.js} +0 -0
- data/public/javascripts/{parse_url.js → refinery/parse_url.js} +0 -0
- data/public/javascripts/{prototype.enhancements.js → refinery/prototype.enhancements.js} +0 -0
- data/public/javascripts/{tooltips.js → refinery/tooltips.js} +0 -0
- data/public/javascripts/tabs.js +135 -133
- data/public/javascripts/wymeditor/jquery.refinery.wymeditor.js +4 -5
- data/public/stylesheets/formatting.css +5 -0
- data/public/stylesheets/home.css +5 -0
- data/public/stylesheets/{formatting.css.example → refinery/formatting.css} +45 -34
- data/public/stylesheets/refinery/home.css +0 -0
- data/public/stylesheets/{refinery.css → refinery/refinery.css} +77 -36
- data/public/stylesheets/refinery/theme.css +36 -0
- data/public/stylesheets/{thickbox.css → refinery/thickbox.css} +0 -0
- data/public/stylesheets/{tooltips.css → refinery/tooltips.css} +0 -0
- data/public/stylesheets/theme.css +1 -36
- data/script/about +3 -0
- data/script/console +3 -0
- data/script/dbconsole +3 -0
- data/script/destroy +3 -0
- data/script/generate +3 -0
- data/script/performance/profiler +3 -0
- data/script/performance/request +3 -0
- data/script/plugin +3 -0
- data/script/process/inspector +3 -0
- data/script/process/reaper +3 -0
- data/script/process/spawner +3 -0
- data/script/runner +3 -0
- data/script/server +3 -0
- data/vendor/plugins/authentication/app/views/sessions/new.html.erb +5 -5
- data/vendor/plugins/images/app/views/admin/images/index.html.erb +4 -5
- data/vendor/plugins/images/app/views/admin/images/insert.html.erb +1 -1
- data/vendor/plugins/inquiries/app/views/admin/inquiries/index.html.erb +3 -4
- data/vendor/plugins/news/app/views/admin/news_items/index.html.erb +4 -5
- data/vendor/plugins/pages/app/views/admin/page_dialogs/_page_link.html.erb +3 -4
- data/vendor/plugins/pages/app/views/admin/page_dialogs/link_to.html.erb +4 -4
- data/vendor/plugins/pages/app/views/admin/pages/_form.html.erb +4 -2
- data/vendor/plugins/pages/app/views/admin/pages/index.html.erb +4 -5
- data/vendor/plugins/refinery/app/views/admin/_head.html.erb +7 -5
- data/vendor/plugins/refinery/app/views/admin/_menu.html.erb +2 -2
- data/vendor/plugins/refinery/app/views/layouts/admin.html.erb +25 -17
- data/vendor/plugins/refinery/app/views/shared/admin/_search.html.erb +1 -1
- data/vendor/plugins/refinery/init.rb +1 -0
- data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/index.html.erb +9 -12
- data/vendor/plugins/refinery/lib/refinery/admin_base_controller.rb +2 -3
- data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb +1 -1
- data/vendor/plugins/resources/app/views/admin/resources/index.html.erb +3 -4
- metadata +35 -85
- data/public/javascripts/jquery/README +0 -67
- data/public/javascripts/jquery/jquery.ui.draggable.js +0 -1
- data/public/javascripts/jquery/jquery.ui.js +0 -1
- data/public/javascripts/jquery/jquery.ui.resizable.js +0 -1
- data/public/javascripts/jquery/jquery.ui.sortable.js +0 -1
- data/public/javascripts/overlabel.js +0 -66
- data/public/stylesheets/application.css.example +0 -76
- data/public/stylesheets/home.css.example +0 -27
- data/public/stylesheets/overlabel.css +0 -21
@@ -1192,7 +1192,7 @@ WYMeditor.editor.prototype.status = function(sMessage) {
|
|
1192
1192
|
*/
|
1193
1193
|
WYMeditor.editor.prototype.update = function() {
|
1194
1194
|
|
1195
|
-
var html = this.xhtml().gsub(/<\/([A-Za-z0-9]*)></, function(m){return "</" + m[1] +">\n<"});
|
1195
|
+
var html = this.xhtml().gsub(/<\/([A-Za-z0-9]*)></, function(m){return "</" + m[1] +">\n<"}).gsub(/src=\"system\/images/, 'src="/system/images'); // make system/images calls absolute.
|
1196
1196
|
jQuery(this._element).val(html);
|
1197
1197
|
jQuery(this._box).find(this._options.htmlValSelector).val(html);
|
1198
1198
|
};
|
@@ -1317,7 +1317,7 @@ WYMeditor.editor.prototype.uniqueStamp = function() {
|
|
1317
1317
|
};
|
1318
1318
|
|
1319
1319
|
WYMeditor.editor.prototype.paste = function(sData) {
|
1320
|
-
|
1320
|
+
console.log('pasting..');
|
1321
1321
|
var sTmp;
|
1322
1322
|
var container = this.selected();
|
1323
1323
|
|
@@ -1608,7 +1608,7 @@ WYMeditor.INIT_DIALOG = function(wym, selected, isIframe) {
|
|
1608
1608
|
else {
|
1609
1609
|
wym._exec(WYMeditor.CREATE_LINK, wym._current_unique_stamp);
|
1610
1610
|
|
1611
|
-
jQuery("a[
|
1611
|
+
jQuery("a[href=" + wym._current_unique_stamp + "]", wym._doc.body)
|
1612
1612
|
.attr(WYMeditor.HREF, sUrl)
|
1613
1613
|
.attr(WYMeditor.TITLE, jQuery(wym._options.titleSelector).val())
|
1614
1614
|
.attr(WYMeditor.TARGET, jQuery(wym._options.targetSelector).val());
|
@@ -3275,7 +3275,7 @@ WYMeditor.XhtmlParser.prototype.parse = function(raw)
|
|
3275
3275
|
WYMeditor.XhtmlParser.prototype.beforeParsing = function(raw)
|
3276
3276
|
{
|
3277
3277
|
if(raw.match(/class="MsoNormal"/) || raw.match(/ns = "urn:schemas-microsoft-com/)){
|
3278
|
-
//
|
3278
|
+
// Useful for cleaning up content pasted from other sources (MSWord)
|
3279
3279
|
this._Listener.avoidStylingTagsAndAttributes();
|
3280
3280
|
}
|
3281
3281
|
return this._Listener.beforeParsing(raw);
|
@@ -4466,7 +4466,6 @@ WYMeditor.WymClassMozilla.prototype.keyup = function(evt) {
|
|
4466
4466
|
&& evt.keyCode != 224
|
4467
4467
|
&& !evt.metaKey
|
4468
4468
|
&& !evt.ctrlKey) {
|
4469
|
-
|
4470
4469
|
//NOT BACKSPACE, NOT DELETE, NOT CTRL, NOT COMMAND
|
4471
4470
|
//text nodes replaced by P
|
4472
4471
|
|
data/public/stylesheets/home.css
CHANGED
@@ -1,36 +1,3 @@
|
|
1
|
-
/* basic formatting styles */
|
2
|
-
body {
|
3
|
-
font-family: Arial, Helvetica, sans-serif;
|
4
|
-
font-size: 14px;
|
5
|
-
}
|
6
|
-
#header h1 a {
|
7
|
-
text-decoration: none;
|
8
|
-
}
|
9
|
-
a, a:visited {
|
10
|
-
color: #1A2DE1;
|
11
|
-
}
|
12
|
-
h1 {
|
13
|
-
font-size: 24px;
|
14
|
-
}
|
15
|
-
h2 {
|
16
|
-
font-size: 14px;
|
17
|
-
}
|
18
|
-
#menu a {
|
19
|
-
text-decoration: none;
|
20
|
-
}
|
21
|
-
#menu li.selected a, #menu a.on, #menu a:hover {
|
22
|
-
text-decoration: underline;
|
23
|
-
}
|
24
|
-
#menu li.selected ul li a {
|
25
|
-
text-decoration: none;
|
26
|
-
}
|
27
|
-
#menu li ul li.selected a, #menu li ul li a.on, #menu li ul li a:hover {
|
28
|
-
text-decoration: underline;
|
29
|
-
}
|
30
|
-
.inquiries .message_field label {
|
31
|
-
vertical-align: top;
|
32
|
-
}
|
33
|
-
|
34
1
|
/* Default error colouring */
|
35
2
|
|
36
3
|
div.fieldWithErrors {
|
@@ -83,4 +50,48 @@ Clearfix docs
|
|
83
50
|
.clearfix {
|
84
51
|
display:block;
|
85
52
|
}
|
86
|
-
/* End hide from IE Mac */
|
53
|
+
/* End hide from IE Mac */
|
54
|
+
|
55
|
+
#page {
|
56
|
+
background: white;
|
57
|
+
padding: 20px;
|
58
|
+
width: 1000px;
|
59
|
+
margin: 0px auto;
|
60
|
+
}
|
61
|
+
#body_content_left {
|
62
|
+
float: left;
|
63
|
+
width: 600px;
|
64
|
+
}
|
65
|
+
#body_content_right {
|
66
|
+
float: right;
|
67
|
+
margin: 0px 12px;
|
68
|
+
width: 360px;
|
69
|
+
}
|
70
|
+
|
71
|
+
.inquiries form label {
|
72
|
+
width: 150px;
|
73
|
+
float: left;
|
74
|
+
}
|
75
|
+
.inquiries form input {
|
76
|
+
|
77
|
+
}
|
78
|
+
.inquiries form input, .inquiries form textarea {
|
79
|
+
|
80
|
+
}
|
81
|
+
.inquiries form textarea {
|
82
|
+
|
83
|
+
}
|
84
|
+
.inquiries form .actions {
|
85
|
+
margin-left: 150px;
|
86
|
+
}
|
87
|
+
|
88
|
+
.inquiries form .actions input {
|
89
|
+
}
|
90
|
+
|
91
|
+
.inquiries .field {
|
92
|
+
margin: 12px 0px;
|
93
|
+
}
|
94
|
+
|
95
|
+
.inquiries form {
|
96
|
+
padding-top: 12px;
|
97
|
+
}
|
File without changes
|
@@ -14,18 +14,6 @@ body {
|
|
14
14
|
background: black url('/images/refinery/page_bg.png') repeat;
|
15
15
|
}
|
16
16
|
|
17
|
-
div.login {
|
18
|
-
width: 300px !important;
|
19
|
-
}
|
20
|
-
|
21
|
-
div.login h1 {
|
22
|
-
margin: 0;
|
23
|
-
padding: 5px;
|
24
|
-
font-size: 20px;
|
25
|
-
text-align: center;
|
26
|
-
line-height:22px
|
27
|
-
}
|
28
|
-
|
29
17
|
acronym {
|
30
18
|
cursor: help;
|
31
19
|
}
|
@@ -114,7 +102,7 @@ hr {
|
|
114
102
|
width: 545px;
|
115
103
|
}
|
116
104
|
.login #flash {
|
117
|
-
width:
|
105
|
+
width: 520px;
|
118
106
|
}
|
119
107
|
#message, #flash {
|
120
108
|
padding: 8px 8px 8px 30px;
|
@@ -167,13 +155,50 @@ a:hover {
|
|
167
155
|
border-bottom: 1px solid #727272;
|
168
156
|
}
|
169
157
|
|
170
|
-
#
|
158
|
+
#page_container {
|
171
159
|
margin: 0px auto 10px auto;
|
172
160
|
text-align: left;
|
173
161
|
width: 990px;
|
162
|
+
}
|
163
|
+
#page_container #page {
|
174
164
|
background: #f6f5f4;
|
175
165
|
}
|
176
166
|
|
167
|
+
#page_container.login {
|
168
|
+
width: 590px;
|
169
|
+
}
|
170
|
+
|
171
|
+
#page_container.login #page h1 {
|
172
|
+
margin: 0;
|
173
|
+
padding: 5px;
|
174
|
+
font-size: 20px;
|
175
|
+
line-height:22px
|
176
|
+
}
|
177
|
+
|
178
|
+
#page_container.login div.session_username, #page_container.login div.session_password {
|
179
|
+
float: left;
|
180
|
+
}
|
181
|
+
|
182
|
+
#page_container.login div.session_password {
|
183
|
+
margin-left: 25px;
|
184
|
+
}
|
185
|
+
|
186
|
+
#page_container.login div.remember_me {
|
187
|
+
margin-top: 12px;
|
188
|
+
}
|
189
|
+
|
190
|
+
#page_container.login div.remember_me label {
|
191
|
+
display: inline;
|
192
|
+
}
|
193
|
+
|
194
|
+
#page_container.login div.session_username input, #page_container.login div.session_password input {
|
195
|
+
width: 260px;
|
196
|
+
}
|
197
|
+
|
198
|
+
#page_container.login div.actions {
|
199
|
+
margin-top: 12px;
|
200
|
+
}
|
201
|
+
|
177
202
|
#header ul#menu {
|
178
203
|
display: block;
|
179
204
|
margin: 0;
|
@@ -232,7 +257,11 @@ pre {
|
|
232
257
|
#header {
|
233
258
|
background: url('/images/refinery/header_background.png') #50504B repeat-x bottom;
|
234
259
|
padding: 26px 15px 0 15px;
|
235
|
-
position: relative;
|
260
|
+
position: relative;
|
261
|
+
}
|
262
|
+
|
263
|
+
#page_container.login #header {
|
264
|
+
padding: 42px 15px 42px 15px;
|
236
265
|
}
|
237
266
|
|
238
267
|
#site_link {
|
@@ -246,10 +275,6 @@ pre {
|
|
246
275
|
text-decoration: underline;
|
247
276
|
}
|
248
277
|
|
249
|
-
#list_actions {
|
250
|
-
|
251
|
-
}
|
252
|
-
|
253
278
|
#header #logo {
|
254
279
|
position: absolute;
|
255
280
|
right: 20px;
|
@@ -273,16 +298,21 @@ pre {
|
|
273
298
|
}
|
274
299
|
|
275
300
|
#footer {
|
276
|
-
|
301
|
+
margin: 0px auto;
|
302
|
+
text-align: center;
|
277
303
|
}
|
278
304
|
|
279
|
-
#
|
280
|
-
|
305
|
+
#footer_logo {
|
306
|
+
border: 0px none;
|
307
|
+
display:inline-block;
|
308
|
+
*display:inline;
|
309
|
+
margin: 50px auto 40px auto;
|
310
|
+
width: auto;
|
281
311
|
}
|
282
312
|
|
283
|
-
#footer, #footer
|
284
|
-
|
285
|
-
|
313
|
+
#footer p, #footer a {
|
314
|
+
color: white;
|
315
|
+
font-size: 11px;
|
286
316
|
}
|
287
317
|
|
288
318
|
#submenu {
|
@@ -759,12 +789,23 @@ body.dialog form {
|
|
759
789
|
#dialog_main #pages_list ul li {
|
760
790
|
cursor: pointer;
|
761
791
|
line-height: 24px;
|
762
|
-
border: 1px solid transparent;
|
763
792
|
list-style: none;
|
764
793
|
}
|
765
794
|
|
766
|
-
#dialog_main #pages_list
|
767
|
-
padding-left:
|
795
|
+
#dialog_main #pages_list li.child a {
|
796
|
+
padding-left: 27px;
|
797
|
+
}
|
798
|
+
#dialog_main #pages_list li.child1 a {
|
799
|
+
padding-left: 47px;
|
800
|
+
}
|
801
|
+
#dialog_main #pages_list li.child2 a {
|
802
|
+
padding-left: 67px;
|
803
|
+
}
|
804
|
+
#dialog_main #pages_list li.child3 a {
|
805
|
+
padding-left: 87px;
|
806
|
+
}
|
807
|
+
#dialog_main #pages_list li.child4 a {
|
808
|
+
padding-left: 107px;
|
768
809
|
}
|
769
810
|
/*
|
770
811
|
#dialog_main #pages_list ul li span {
|
@@ -772,22 +813,22 @@ body.dialog form {
|
|
772
813
|
padding: 3px;
|
773
814
|
margin-left: 24px;
|
774
815
|
}*/
|
775
|
-
#dialog_main #pages_list ul li a
|
816
|
+
#dialog_main #pages_list ul li a {
|
776
817
|
display: block;
|
777
|
-
padding: 3px;
|
778
|
-
|
779
|
-
|
780
|
-
|
818
|
+
padding: 3px 3px 3px 27px;
|
819
|
+
text-decoration: none;
|
820
|
+
border-bottom: none;
|
821
|
+
border: 1px solid transparent;
|
781
822
|
}
|
782
|
-
#dialog_main #pages_list li:hover {
|
783
|
-
background-color: #C9DAE2
|
823
|
+
#dialog_main #pages_list li a:hover {
|
824
|
+
background-color: #C9DAE2;
|
784
825
|
}
|
785
826
|
|
786
827
|
#dialog_main .actions {
|
787
828
|
margin-right: 48px;
|
788
829
|
}
|
789
830
|
|
790
|
-
#dialog_main #pages_list .linked, #dialog_main #pages_list .linked:hover {
|
831
|
+
#dialog_main #pages_list .linked a, #dialog_main #pages_list .linked a:hover {
|
791
832
|
border: 1px solid #00A017;
|
792
833
|
color: #00A017;
|
793
834
|
background: 7px 7px no-repeat url('/images/refinery/icons/accept.png') #E0F5E0;
|
@@ -0,0 +1,36 @@
|
|
1
|
+
/* alignment styles */
|
2
|
+
.text-align-left {
|
3
|
+
text-align: left;
|
4
|
+
}
|
5
|
+
.text-align-center {
|
6
|
+
text-align: center;
|
7
|
+
}
|
8
|
+
.text-align-right {
|
9
|
+
text-align: right;
|
10
|
+
}
|
11
|
+
.text-align-justify {
|
12
|
+
text-align: justify;
|
13
|
+
}
|
14
|
+
|
15
|
+
/* block alignment styles */
|
16
|
+
.image-align-left {
|
17
|
+
float: left;
|
18
|
+
margin-right: 6px;
|
19
|
+
margin-bottom: 6px;
|
20
|
+
}
|
21
|
+
.image-align-right {
|
22
|
+
float: right;
|
23
|
+
margin-left: 6px;
|
24
|
+
margin-bottom: 6px;
|
25
|
+
}
|
26
|
+
|
27
|
+
/* font sizes */
|
28
|
+
.font-size-small {
|
29
|
+
font-size: 0.75em;
|
30
|
+
}
|
31
|
+
.font-size-normal {
|
32
|
+
font-size: 1em;
|
33
|
+
}
|
34
|
+
.font-size-large {
|
35
|
+
font-size: 1.25em;
|
36
|
+
}
|
File without changes
|
File without changes
|
@@ -1,36 +1 @@
|
|
1
|
-
|
2
|
-
.text-align-left {
|
3
|
-
text-align: left;
|
4
|
-
}
|
5
|
-
.text-align-center {
|
6
|
-
text-align: center;
|
7
|
-
}
|
8
|
-
.text-align-right {
|
9
|
-
text-align: right;
|
10
|
-
}
|
11
|
-
.text-align-justify {
|
12
|
-
text-align: justify;
|
13
|
-
}
|
14
|
-
|
15
|
-
/* block alignment styles */
|
16
|
-
.image-align-left {
|
17
|
-
float: left;
|
18
|
-
margin-right: 6px;
|
19
|
-
margin-bottom: 6px;
|
20
|
-
}
|
21
|
-
.image-align-right {
|
22
|
-
float: right;
|
23
|
-
margin-left: 6px;
|
24
|
-
margin-bottom: 6px;
|
25
|
-
}
|
26
|
-
|
27
|
-
/* font sizes */
|
28
|
-
.font-size-small {
|
29
|
-
font-size: 0.75em;
|
30
|
-
}
|
31
|
-
.font-size-normal {
|
32
|
-
font-size: 1em;
|
33
|
-
}
|
34
|
-
.font-size-large {
|
35
|
-
font-size: 1.25em;
|
36
|
-
}
|
1
|
+
@import url('/stylesheets/refinery/theme.css');
|
data/script/about
ADDED
data/script/console
ADDED
data/script/dbconsole
ADDED
data/script/destroy
ADDED
data/script/generate
ADDED
data/script/plugin
ADDED