Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

2013-08-21 13:10:16 +02:00
parent a75cfc5a2d 3c55ccb590
commit 4e1c915781
6 changed files with 43 additions and 14 deletions
--- a/src/Umbraco.Web.UI.Client/gruntFile.js
+++ b/src/Umbraco.Web.UI.Client/gruntFile.js
@@ -4,9 +4,13 @@ module.exports = function (grunt) {
  grunt.registerTask('default', ['jshint:dev','build','karma:unit']);
  grunt.registerTask('dev', ['jshint:dev', 'build', 'webserver', 'open:dev', 'watch']);
  
+
  //run by the watch task
-  grunt.registerTask('watch-build', ['jshint:dev','recess:build','concat','copy','karma:unit']);
-  
+  grunt.registerTask('watch-js', ['jshint:dev','concat','copy:app','copy:mocks','copy:app','karma:unit', 'copy:vs', 'copy:assets']);
+  grunt.registerTask('watch-less', ['recess:build','copy:assets','copy:vs']);
+  grunt.registerTask('watch-html', ['copy:views', 'copy:vs']);
+
+
  //triggered from grunt dev or grunt
  grunt.registerTask('build', ['clean','concat','recess:build','copy']);

@@ -14,11 +18,13 @@ module.exports = function (grunt) {
  grunt.registerTask('docs', ['markdown', 'ngdocs']);
  grunt.registerTask('webserver', ['connect:devserver']);

+
  // Print a timestamp (useful for when watching)
  grunt.registerTask('timestamp', function() {
    grunt.log.subhead(Date());
  });

+
  // Project configuration.
  grunt.initConfig({
    connect: {
@@ -91,6 +97,7 @@ module.exports = function (grunt) {
            { dest: '<%= distdir %>/js', src : '*.js', expand: true, cwd: 'src/' }
            ]
      },
+
      media: {
        files: [{ dest: 'build/media', src : '*.*', expand: true, cwd: 'media/' }]
      },
@@ -108,6 +115,7 @@ module.exports = function (grunt) {
              { dest: '<%= vsdir %>/views', src: '**', expand: true, cwd: '<%= distdir %>/views' }
          ]
      },
+
      packages: {
        files: [{ dest: '<%= vsdir %>/../App_Plugins', src : '**', expand: true, cwd: 'src/packages/' }]
      }
@@ -227,9 +235,20 @@ module.exports = function (grunt) {
    },

    watch:{
-      dev: {
-        files:['<%= src.everything %>'],
-        tasks:['watch-build','timestamp']
+      css: {
+          files: '**/*.less',
+          tasks: ['watch-less', 'timestamp'],
+          options: {
+            livereload: true,
+          },
+      },
+      js: {
+          files: ['src/**/*.js', 'src/*.js'],
+          tasks: ['watch-js', 'timestamp'],
+      },
+      html: {
+        files: ['src/views/**/*.html', 'src/*.html'],
+        tasks:['watch-html','timestamp']
      }
    },

--- a/src/Umbraco.Web.UI.Client/src/index.html
+++ b/src/Umbraco.Web.UI.Client/src/index.html
@@ -8,18 +8,17 @@
    <title>Umbraco</title>
    <link rel="stylesheet" href="assets/css/umbraco.css" />
 </head>
-<body ng-controller="Umbraco.MainController" id="umbracoMainPageBody">

-    <div ng-hide="!authenticated" ng-cloak ng-animate="'fade'" id="Div1" class="clearfix" ng-click="closeDialogs($event)">
+<body ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
+    <div ng-hide="!authenticated" ng-cloak ng-animate="'fade'" id="mainwrapper" class="clearfix" ng-click="closeDialogs($event)">
        <umb-navigation></umb-navigation>
+        
        <section id="contentwrapper">
            <div id="contentcolumn">
-                <div ng-view></div>
+                <div class="content-column-body" ng-view></div>
            </div>
        </section>
    </div>
-
-
    <umb-notifications></umb-notifications>


--- a/src/Umbraco.Web.UI.Client/src/less/grid.less
+++ b/src/Umbraco.Web.UI.Client/src/less/grid.less
@@ -29,6 +29,11 @@ body {
  z-index: 1;
 }

+#mainwrapper {
+  height: 100%;
+  margin: 0
+}
+
 #contentwrapper {
  height: 100%;
  z-index: 10;
@@ -38,9 +43,12 @@ body {
 #contentcolumn {
  position: relative;
  margin-left: 80px;
-  z-index: 10
+  z-index: 10;
+  height: 100%;
 }

+.content-column-body{height: 100%;}
+
 #contentcolumn iframe {
  display: block;
  position: relative;
@@ -93,6 +101,7 @@ body {
  padding: 15px 0px 20px 0px;
  position: relative;
  z-index: 100 !important;
+  height: 100%;
 }

 #search-results {
--- a/src/Umbraco.Web.UI.Client/src/loader.js
+++ b/src/Umbraco.Web.UI.Client/src/loader.js
@@ -12,6 +12,7 @@ yepnope({
        'lib/jquery/jquery.ui.effect.min.js',
        'lib/jquery/jquery.ui.effect-highlight.min.js',
 		
+
 		'lib/angular/angular.min.js',
        'lib/angular/angular-cookies.min.js',
 		'lib/angular/angular-mocks.js',
@@ -34,7 +35,7 @@ yepnope({
 		'js/umbraco.security.js',
 		'js/umbraco.controllers.js',
 		'js/routes.js'
-  		],
+  ],

  complete: function () {
    jQuery(document).ready(function () {
--- a/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
+++ b/src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
@@ -21,7 +21,7 @@

 </head>
 <body ng-controller="Umbraco.MainController" id="umbracoMainPageBody">
-    <div ng-cloak id="Div1" class="clearfix" ng-click="closeDialogs($event)">
+    <div ng-cloak id="mainwrapper" class="clearfix" ng-click="closeDialogs($event)">

        <umb-navigation></umb-navigation>

--- a/src/Umbraco.Web.UI/umbraco/js/loader.js
+++ b/src/Umbraco.Web.UI/umbraco/js/loader.js
@@ -12,6 +12,7 @@ yepnope({
        'lib/jquery/jquery.ui.effect.min.js',
        'lib/jquery/jquery.ui.effect-highlight.min.js',
 		
+
 		'lib/angular/angular.min.js',
        'lib/angular/angular-cookies.min.js',
 		'lib/angular/angular-mocks.js',
@@ -34,7 +35,7 @@ yepnope({
 		'js/umbraco.security.js',
 		'js/umbraco.controllers.js',
 		'js/routes.js'
-  		],
+  ],

  complete: function () {
    jQuery(document).ready(function () {