Skip to content

Commit a5ea8b1

Browse files
committed
Finished removing /blogs/ folder
1 parent 9740b15 commit a5ea8b1

1,913 files changed

Lines changed: 74 additions & 953 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Gruntfile.js

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -37,29 +37,29 @@ module.exports = function(grunt) {
3737
},
3838
files: {
3939
// target.css file: source.less file
40-
'blogs/rsc/build/testless.css': 'blogs/rsc/less/test.less',
40+
'rsc/build/testless.css': 'rsc/less/test.less',
4141
// Basic styles:
42-
'blogs/rsc/css/basic_styles.css': 'blogs/rsc/less/basic_styles.less',
43-
'blogs/rsc/css/basic.css': 'blogs/rsc/less/basic.less',
44-
'blogs/rsc/css/blog_base.css': 'blogs/rsc/less/blog_base.less',
45-
'blogs/rsc/css/item_base.css': 'blogs/rsc/less/item_base.less',
42+
'rsc/css/basic_styles.css': 'rsc/less/basic_styles.less',
43+
'rsc/css/basic.css': 'rsc/less/basic.less',
44+
'rsc/css/blog_base.css': 'rsc/less/blog_base.less',
45+
'rsc/css/item_base.css': 'rsc/less/item_base.less',
4646
// Bootstrap frontoffice styles:
47-
'blogs/rsc/build/bootstrap-b2evo_base.bundle.css': [
47+
'rsc/build/bootstrap-b2evo_base.bundle.css': [
4848
// Basic styles for all bootstrap skins
49-
'blogs/rsc/less/bootstrap-basic_styles.less',
50-
'blogs/rsc/less/bootstrap-basic.less',
51-
'blogs/rsc/less/bootstrap-blog_base.less',
52-
'blogs/rsc/less/bootstrap-item_base.less',
49+
'rsc/less/bootstrap-basic_styles.less',
50+
'rsc/less/bootstrap-basic.less',
51+
'rsc/less/bootstrap-blog_base.less',
52+
'rsc/less/bootstrap-item_base.less',
5353
// Common styles for all bootstrap skins
54-
'blogs/rsc/less/bootstrap-evoskins.less'
54+
'rsc/less/bootstrap-evoskins.less'
5555
],
5656
// Bootstrap backoffice styles:
57-
'blogs/rsc/build/bootstrap-backoffice-b2evo_base.bundle.css': [
57+
'rsc/build/bootstrap-backoffice-b2evo_base.bundle.css': [
5858
// Basic styles for all bootstrap skins
59-
'blogs/rsc/less/bootstrap-basic_styles.less',
60-
'blogs/rsc/less/bootstrap-basic.less',
59+
'rsc/less/bootstrap-basic_styles.less',
60+
'rsc/less/bootstrap-basic.less',
6161
// Common styles for all bootstrap skins
62-
'blogs/rsc/less/bootstrap-evoskins.less'
62+
'rsc/less/bootstrap-evoskins.less'
6363
],
6464
}
6565
},
@@ -70,9 +70,9 @@ module.exports = function(grunt) {
7070
},
7171
files: {
7272
// Bootstrap skins
73-
'blogs/skins_adm/bootstrap/rsc/css/style.css': 'blogs/skins_adm/bootstrap/rsc/css/style.less',
74-
'blogs/skins/bootstrap/style.css': 'blogs/skins/bootstrap/style.less',
75-
'blogs/skins/bootstrap_main/style.css': 'blogs/skins/bootstrap_main/style.less',
73+
'skins_adm/bootstrap/rsc/css/style.css': 'skins_adm/bootstrap/rsc/css/style.less',
74+
'skins/bootstrap/style.css': 'skins/bootstrap/style.less',
75+
'skins/bootstrap_main/style.css': 'skins/bootstrap_main/style.less',
7676
}
7777
}
7878
},
@@ -85,10 +85,10 @@ module.exports = function(grunt) {
8585
},
8686
files: {
8787
// target.css file: source.scss file
88-
//'blogs/rsc/build/testscss.css': 'blogs/rsc/scss/test.scss',
89-
'blogs/skins/pureforums/pureforums_header.css': 'blogs/skins/pureforums/pureforums_header.scss',
90-
'blogs/skins/pureforums/pureforums_main.css': 'blogs/skins/pureforums/pureforums_main.scss',
91-
'blogs/skins/pureforums/pureforums_footer.css': 'blogs/skins/pureforums/pureforums_footer.scss',
88+
//'rsc/build/testscss.css': 'rsc/scss/test.scss',
89+
'skins/pureforums/pureforums_header.css': 'skins/pureforums/pureforums_header.scss',
90+
'skins/pureforums/pureforums_main.css': 'skins/pureforums/pureforums_main.scss',
91+
'skins/pureforums/pureforums_footer.css': 'skins/pureforums/pureforums_footer.scss',
9292
}
9393
}
9494
},
@@ -107,26 +107,26 @@ module.exports = function(grunt) {
107107
banner: '<%= concat.options.banner %>/* This includes: basic_styles.css, basic.css, blog_base.css, item_base.css */\n'
108108
},
109109
nonull: true, // Display missing files
110-
src: ['blogs/rsc/css/basic_styles.css', 'blogs/rsc/css/basic.css', 'blogs/rsc/css/blog_base.css', 'blogs/rsc/css/item_base.css'],
111-
dest: 'blogs/rsc/build/b2evo_base.bundle.css',
110+
src: ['rsc/css/basic_styles.css', 'rsc/css/basic.css', 'rsc/css/blog_base.css', 'rsc/css/item_base.css'],
111+
dest: 'rsc/build/b2evo_base.bundle.css',
112112
},
113113
skin_evopress: {
114114
nonull: true, // Display missing files
115-
src: ['blogs/skins/evopress/style.css', 'blogs/skins/evopress/item.css'],
116-
dest: 'blogs/skins/evopress/evopress.bundle.css',
115+
src: ['skins/evopress/style.css', 'skins/evopress/item.css'],
116+
dest: 'skins/evopress/evopress.bundle.css',
117117
},
118118
skin_pureforums: {
119119
nonull: true, // Display missing files
120-
src: ['blogs/skins/pureforums/pureforums_header.css', 'blogs/skins/pureforums/pureforums_main.css', 'blogs/skins/pureforums/pureforums_footer.css'],
121-
dest: 'blogs/skins/pureforums/pureforums.bundle.css',
120+
src: ['skins/pureforums/pureforums_header.css', 'skins/pureforums/pureforums_main.css', 'skins/pureforums/pureforums_footer.css'],
121+
dest: 'skins/pureforums/pureforums.bundle.css',
122122
},
123123
/*
124124
* JS:
125125
*/
126126
// Login screen:
127127
sha1_md5: {
128-
src: ['blogs/rsc/js/src/sha1.js', 'blogs/rsc/js/src/md5.js'],
129-
dest: 'blogs/rsc/js/build/sha1_md5.bundle.js',
128+
src: ['rsc/js/src/sha1.js', 'rsc/js/src/md5.js'],
129+
dest: 'rsc/js/build/sha1_md5.bundle.js',
130130
},
131131
},
132132

@@ -138,26 +138,26 @@ module.exports = function(grunt) {
138138
},
139139
b2evo_base: {
140140
nonull: true, // Display missing files
141-
src: 'blogs/rsc/build/b2evo_base.bundle.css',
142-
dest: 'blogs/rsc/build/b2evo_base.bmin.css',
141+
src: 'rsc/build/b2evo_base.bundle.css',
142+
dest: 'rsc/build/b2evo_base.bmin.css',
143143
},
144144
bootstrap_b2evo_base: {
145145
nonull: true, // Display missing files
146-
src: 'blogs/rsc/build/bootstrap-b2evo_base.bundle.css',
147-
dest: 'blogs/rsc/build/bootstrap-b2evo_base.bmin.css',
146+
src: 'rsc/build/bootstrap-b2evo_base.bundle.css',
147+
dest: 'rsc/build/bootstrap-b2evo_base.bmin.css',
148148
},
149149
bootstrap_backoffice_b2evo_base: {
150150
nonull: true, // Display missing files
151-
src: 'blogs/rsc/build/bootstrap-backoffice-b2evo_base.bundle.css',
152-
dest: 'blogs/rsc/build/bootstrap-backoffice-b2evo_base.bmin.css',
151+
src: 'rsc/build/bootstrap-backoffice-b2evo_base.bundle.css',
152+
dest: 'rsc/build/bootstrap-backoffice-b2evo_base.bmin.css',
153153
},
154154
skin_evopress: {
155-
src: 'blogs/skins/evopress/evopress.bundle.css',
156-
dest: 'blogs/skins/evopress/evopress.bmin.css',
155+
src: 'skins/evopress/evopress.bundle.css',
156+
dest: 'skins/evopress/evopress.bmin.css',
157157
},
158158
skin_pureforums: {
159-
src: 'blogs/skins/pureforums/pureforums.bundle.css',
160-
dest: 'blogs/skins/pureforums/pureforums.bmin.css',
159+
src: 'skins/pureforums/pureforums.bundle.css',
160+
dest: 'skins/pureforums/pureforums.bmin.css',
161161
},
162162
},
163163

@@ -166,24 +166,24 @@ module.exports = function(grunt) {
166166
// Login screen:
167167
sha1_md5: {
168168
nonull: true, // Display missing files
169-
src: ['blogs/rsc/js/build/sha1_md5.bundle.js'],
170-
dest: 'blogs/rsc/js/build/sha1_md5.bmin.js'
169+
src: ['rsc/js/build/sha1_md5.bundle.js'],
170+
dest: 'rsc/js/build/sha1_md5.bmin.js'
171171
},
172172
// Another Target:
173173
/* Early tests:
174174
functionsjs: {
175175
nonull: true, // Display missing files
176-
src: 'blogs/rsc/js/functions.js',
177-
dest: 'blogs/rsc/js/build/functions.min.js'
176+
src: 'rsc/js/functions.js',
177+
dest: 'rsc/js/build/functions.min.js'
178178
},
179179
ajaxcomjs: {
180180
options: {
181181
// Extend default banner:
182182
banner: '<%= uglify.options.banner %>// This includes 2 files \n'
183183
},
184184
nonull: true, // Display missing files
185-
src: ['blogs/rsc/js/ajax.js', 'blogs/rsc/js/communication.js'],
186-
dest: 'blogs/rsc/js/build/ajaxcom.min.js',
185+
src: ['rsc/js/ajax.js', 'rsc/js/communication.js'],
186+
dest: 'rsc/js/build/ajaxcom.min.js',
187187
},
188188
*/
189189
// Colorbox + Voting + Touchswipe
@@ -192,8 +192,8 @@ module.exports = function(grunt) {
192192
banner: '/* This includes 4 files: jquery.colorbox.js, voting.js, jquery.touchswipe.js, colorbox.init.js */\n'
193193
},
194194
nonull: true, // Display missing files
195-
src: ['blogs/rsc/js/colorbox/jquery.colorbox.js', 'blogs/rsc/js/voting.js', 'blogs/rsc/js/jquery/jquery.touchswipe.js', 'blogs/rsc/js/colorbox/colorbox.init.js'],
196-
dest: 'blogs/rsc/js/build/colorbox.bmin.js'
195+
src: ['rsc/js/colorbox/jquery.colorbox.js', 'rsc/js/voting.js', 'rsc/js/jquery/jquery.touchswipe.js', 'rsc/js/colorbox/colorbox.init.js'],
196+
dest: 'rsc/js/build/colorbox.bmin.js'
197197
},
198198
// Bubbletip
199199
bubbletip: {
@@ -203,60 +203,60 @@ module.exports = function(grunt) {
203203
nonull: true, // Display missing files
204204
// fp>yura: why isn't jquery.bubbletip.js bundled into this?
205205
// if plugins.js is used only for editing we should probably move it to a textedit.bundle
206-
src: ['blogs/rsc/js/bubbletip.js', 'blogs/rsc/js/plugins.js', 'blogs/rsc/js/userfields.js', 'blogs/rsc/js/colorpicker.js'],
207-
dest: 'blogs/rsc/js/build/bubbletip.bmin.js'
206+
src: ['rsc/js/bubbletip.js', 'rsc/js/plugins.js', 'rsc/js/userfields.js', 'rsc/js/colorpicker.js'],
207+
dest: 'rsc/js/build/bubbletip.bmin.js'
208208
},
209209
// Popover (Analog of bubbletip on bootstrap skins)
210210
popover: {
211211
options: {
212212
banner: '/* This includes 4 files: bootstrap/usernames.js, bootstrap/plugins.js, bootstrap/userfields.js, bootstrap/colorpicker.js */\n'
213213
},
214214
nonull: true, // Display missing files
215-
src: ['blogs/rsc/js/bootstrap/usernames.js', 'blogs/rsc/js/bootstrap/plugins.js', 'blogs/rsc/js/bootstrap/userfields.js', 'blogs/rsc/js/bootstrap/colorpicker.js'],
216-
dest: 'blogs/rsc/js/build/popover.bmin.js'
215+
src: ['rsc/js/bootstrap/usernames.js', 'rsc/js/bootstrap/plugins.js', 'rsc/js/bootstrap/userfields.js', 'rsc/js/bootstrap/colorpicker.js'],
216+
dest: 'rsc/js/build/popover.bmin.js'
217217
},
218218
// Textcomplete plugin to suggest user names in textareas with '@username'
219219
textcomplete: {
220220
options: {
221221
banner: '/* This includes 2 files: jquery.textcomplete.js, textcomplete.init.js */\n'
222222
},
223223
nonull: true, // Display missing files
224-
src: ['blogs/rsc/js/jquery/jquery.textcomplete.js', 'blogs/rsc/js/textcomplete.init.js'],
225-
dest: 'blogs/rsc/js/build/textcomplete.bmin.js'
224+
src: ['rsc/js/jquery/jquery.textcomplete.js', 'rsc/js/textcomplete.init.js'],
225+
dest: 'rsc/js/build/textcomplete.bmin.js'
226226
},
227227
},
228228

229229
// Configuration for the watch tasks:
230230
watch: {
231231
/* Early tests:
232232
functionsjs: {
233-
files: ['blogs/rsc/js/functions.js'],
233+
files: ['rsc/js/functions.js'],
234234
tasks: ['uglify:functionsjs'],
235235
},
236236
ajaxcomjs: {
237-
files: ['blogs/rsc/js/ajax.js', 'blogs/rsc/js/communication.js'],
237+
files: ['rsc/js/ajax.js', 'rsc/js/communication.js'],
238238
tasks: ['uglify:ajaxcomjs'],
239239
},
240240
*/
241241
less: {
242242
// Which files to watch (all .less files recursively in the whole blogs directory)
243-
files: ['blogs/**/*.less'],
243+
files: ['**/*.less'],
244244
tasks: ['less'],
245245
options: {
246246
nospawn: true,
247247
}
248248
},
249249
sass: {
250250
// Which files to watch (all .scss files recursively in the scss directory)
251-
files: ['blogs/**/*.scss'],
251+
files: ['**/*.scss'],
252252
tasks: ['sass'],
253253
options: {
254254
nospawn: true,
255255
}
256256
},
257257
concat_cssmin: {
258258
// Which files to watch (all .css files recursively in the whole blogs directory)
259-
files: ['blogs/**/*.css'],
259+
files: ['**/*.css'],
260260
tasks: ['concat','cssmin'],
261261
options: {
262262
nospawn: true,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)