Skip to content

Commit 344b880

Browse files
nul800sebastiaannul800sebastiaan
committed
Merge branch '7.1.2-Usky' of https://github.com/umbraco/UmbracoCms-Internal into 7.2.0
Conflicts: src/Umbraco.Web.UI.Client/src/views/common/dialogs/content/edit.controller.js src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js src/Umbraco.Web/Umbraco.Web.csproj
2 parents c958f12 + db4509d commit 344b880

File tree

91 files changed

+15093
-400
lines changed

Some content is hidden

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

91 files changed

+15093
-400
lines changed

‎.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,12 @@ src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
7878
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
7979
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
8080

81+
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
82+
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
83+
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
84+
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
85+
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js
86+
8187
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
8288
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
8389
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css

‎src/Umbraco.Core/Constants-Applications.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,11 @@ public static class Trees
7070

7171
//TODO: Fill in the rest!
7272

73+
/// <summary>
74+
/// alias for the media tree.
75+
/// </summary>
76+
public const string Templates = "template";
77+
7378
}
7479
}
7580

‎src/Umbraco.Core/Constants-PropertyEditors.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,12 @@ public static class PropertyEditors
130130
/// </summary>
131131
public const string FolderBrowserAlias = "Umbraco.FolderBrowser";
132132

133+
/// <summary>
134+
/// Alias for the grid datatype.
135+
/// </summary>
136+
public const string GridAlias = "Umbraco.Grid";
137+
138+
133139
/// <summary>
134140
/// Guid for the Image Cropper datatype.
135141
/// </summary>

‎src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,6 @@ private void PopulateViewTemplate(ITemplate template, string fileName)
371371
//template.CreateDate = _viewsFileSystem.GetCreated(path).UtcDateTime;
372372
//template.Key = new FileInfo(path).Name.EncodeAsGuid();
373373

374-
template.Path = path;
375374
template.Content = content;
376375
}
377376

‎src/Umbraco.Web.UI.Client/bower.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
"tests"
1717
],
1818
"dependencies": {
19-
"typeahead.js": "~0.10.2"
19+
"typeahead.js": "~0.10.2",
20+
"ace-builds": "~1.1.3",
21+
"rgrove-lazyload": "*"
2022
}
2123
}

‎src/Umbraco.Web.UI.Client/gruntFile.js

Lines changed: 58 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@ module.exports = function (grunt) {
66
grunt.registerTask('dev', ['jshint:dev', 'build', 'webserver', 'open:dev', 'watch']);
77

88
//run by the watch task
9-
grunt.registerTask('watch-js', ['jshint:dev','concat','copy:app','copy:mocks','copy:packages','copy:vs','karma:unit']);
10-
grunt.registerTask('watch-less', ['recess:build','recess:installer','copy:assets','copy:vs']);
9+
grunt.registerTask('watch-js', ['jshint:dev','concat','copy:app','copy:mocks','copy:packages','copy:tuning','copy:vs','karma:unit']);
10+
grunt.registerTask('watch-less', ['recess:build', 'recess:installer', 'recess:tuning','copy:tuning', 'copy:assets', 'copy:vs']);
1111
grunt.registerTask('watch-html', ['copy:views', 'copy:vs']);
1212
grunt.registerTask('watch-packages', ['copy:packages']);
13-
grunt.registerTask('watch-installer', ['concat:install','concat:installJs','copy:installer', 'copy:vs']);
13+
grunt.registerTask('watch-installer', ['concat:install', 'concat:installJs', 'copy:installer', 'copy:vs']);
14+
grunt.registerTask('watch-tuning', ['copy:tuning', 'concat:tuningJs', 'copy:vs']);
1415
grunt.registerTask('watch-test', ['jshint:dev', 'karma:unit']);
1516

1617
//triggered from grunt dev or grunt
17-
grunt.registerTask('build', ['clean','concat','recess:min','recess:installer','copy']);
18+
grunt.registerTask('build', ['clean', 'concat', 'recess:min', 'recess:installer', 'recess:tuning', 'bower', 'copy']);
1819

1920
//utillity tasks
2021
grunt.registerTask('docs', ['ngdocs']);
@@ -109,23 +110,48 @@ module.exports = function (grunt) {
109110
clean: ['<%= distdir %>/*'],
110111

111112
copy: {
112-
113-
/* Copies over the files downloaded by bower
114-
bower: {
115-
files: [
116-
{ dest: '<%= distdir %>/lib/typeahead/typeahead.bundle.min.js', src: '<%= bowerfiles %>/typeahead.js/dist/typeahead.bundle.min.js' }
117-
]
118-
},
119-
*/
120-
121113
assets: {
122114
files: [{ dest: '<%= distdir %>/assets', src : '**', expand: true, cwd: 'src/assets/' }]
123115
},
124116

117+
118+
// Copies over the files downloaded by bower
119+
bower: {
120+
files: [
121+
{
122+
dest: '<%= distdir %>/lib/typeahead/typeahead.bundle.min.js',
123+
src: 'bower_components/typeahead.js/dist/typeahead.bundle.min.js'
124+
},
125+
{
126+
dest: '<%= distdir %>/lib/lazyload/lazyload.min.js',
127+
src: 'bower_components/rgrove-lazyload/lazyload.js'
128+
},
129+
{
130+
dest: '<%= distdir %>/lib/ace/',
131+
src: '**',
132+
expand: true,
133+
cwd: 'bower_components/ace-builds/src-min-noconflict/'
134+
}
135+
]
136+
},
137+
138+
125139
installer: {
126140
files: [{ dest: '<%= distdir %>/views/install', src : '**/*.html', expand: true, cwd: 'src/installer/steps' }]
127141
},
128142

143+
tuning: {
144+
files: [
145+
{ dest: '<%= distdir %>/preview', src: '**/*.html', expand: true, cwd: 'src/tuning' },
146+
{ dest: '<%= distdir %>/assets/css', src: 'tuning.defaultStyle.css', expand: true, cwd: 'src/tuning' },
147+
{ dest: '<%= distdir %>/assets/less', src: 'tuning.defaultStyle.less', expand: true, cwd: 'src/tuning' },
148+
{ dest: '<%= distdir %>/assets/less', src: 'tuning.gridRowStyle.less', expand: true, cwd: 'src/tuning' },
149+
{ dest: '<%= distdir %>/js', src: 'tuning.config.js', expand: true, cwd: 'src/tuning/config' },
150+
{ dest: '<%= distdir %>/js', src: 'tuning.palettes.js', expand: true, cwd: 'src/tuning/config' },
151+
{ dest: '<%= distdir %>/js', src: 'tuning.front.js', expand: true, cwd: 'src/tuning' }
152+
]
153+
},
154+
129155
vendor: {
130156
files: [{ dest: '<%= distdir %>/lib', src : '**', expand: true, cwd: 'lib/' }]
131157
},
@@ -147,7 +173,8 @@ module.exports = function (grunt) {
147173
{ dest: '<%= vsdir %>/assets', src: '**', expand: true, cwd: '<%= distdir %>/assets' },
148174
{ dest: '<%= vsdir %>/js', src: '**', expand: true, cwd: '<%= distdir %>/js' },
149175
{ dest: '<%= vsdir %>/lib', src: '**', expand: true, cwd: '<%= distdir %>/lib' },
150-
{ dest: '<%= vsdir %>/views', src: '**', expand: true, cwd: '<%= distdir %>/views' }
176+
{ dest: '<%= vsdir %>/views', src: '**', expand: true, cwd: '<%= distdir %>/views' },
177+
{ dest: '<%= vsdir %>/preview', src: '**', expand: true, cwd: '<%= distdir %>/preview' }
151178
]
152179
},
153180

@@ -186,6 +213,10 @@ module.exports = function (grunt) {
186213
footer: "\n\n})();"
187214
}
188215
},
216+
tuningJs: {
217+
src: ['src/tuning/tuning.global.js', 'src/tuning/tuning.controller.js', 'src/tuning/lib/slider.directive.js', 'src/tuning/lib/spectrum.directive.js'],
218+
dest: '<%= distdir %>/js/tuning.panel.js'
219+
},
189220
controllers: {
190221
src:['src/controllers/**/*.controller.js','src/views/**/*.controller.js'],
191222
dest: '<%= distdir %>/js/umbraco.controllers.js',
@@ -272,6 +303,15 @@ module.exports = function (grunt) {
272303
compile: true
273304
}
274305
},
306+
tuning: {
307+
files: {
308+
'<%= distdir %>/assets/css/tuning.panelStyles.css':
309+
['src/less/tuning.panelStyles.less', 'src/less/helveticons.less']
310+
},
311+
options: {
312+
compile: true
313+
}
314+
},
275315
min: {
276316
files: {
277317
'<%= distdir %>/assets/css/<%= pkg.name %>.css': ['<%= src.less %>']
@@ -304,6 +344,10 @@ module.exports = function (grunt) {
304344
files: ['src/installer/**/*.*'],
305345
tasks: ['watch-installer', 'timestamp'],
306346
},
347+
tuning: {
348+
files: ['src/tuning/**/*.*'],
349+
tasks: ['watch-tuning', 'timestamp'],
350+
},
307351
html: {
308352
files: ['src/views/**/*.html', 'src/*.html'],
309353
tasks:['watch-html','timestamp']

‎src/Umbraco.Web.UI.Client/lib/angular-bootstrap/ui-bootstrap-tpls-0.10.0.min.js

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Umbraco.Web.UI.Client/lib/bootstrap/css/bootstrap.min.3.0.1.css

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Umbraco.Web.UI.Client/lib/bootstrap/less/code.less

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// Inline and block code styles
77
code,
8-
pre {
8+
pre.code {
99
padding: 0 3px 2px;
1010
#font > #family > .monospace;
1111
font-size: @baseFontSize - 2;
@@ -23,7 +23,7 @@ code {
2323
}
2424

2525
// Blocks of code
26-
pre {
26+
pre.code {
2727
display: block;
2828
padding: (@baseLineHeight - 1) / 2;
2929
margin: 0 0 @baseLineHeight / 2;

0 commit comments

Comments
 (0)