Merge branch 'master' of github.com:InTradeSysTeam/webmaker-app

blocks/data/index.js

@@ -27,12 +27,15 @@ module.exports = {
     },
     ready: function (){
         var self = this;
-		// Fetch collected Data
 
-		/*var data = new Data('foooobar');
+		// Fetch collected Data
 		self.currentDataSets = [];
-		data.getAllDataSets(function(currentDataSets) {
+		if(!self.isEditing) {
-			self.currentDataSets = currentDataSets;
+			var data = new Data(self.$parent.$parent.$data.app.id);
-		});*/
+
+			data.getAllDataSets(function(currentDataSets) {
+				self.currentDataSets = currentDataSets;
+			});
+		}
     }
 };

components/dataRepresentation/index.less

@@ -114,6 +114,8 @@
 
     .noDataInfo {
         border-bottom: 1px solid @borderColor;
+        border-top: 1px solid @borderColor;
+        margin-top: -1px;
         padding: 10px 14px;
         font-size: 14px;
         color: @darkGrey;