Merge branch 'master' of gitlab.isb-sib.ch:wikmgroup/vikmapp-ng

app/scripts/controllers/news/edit.js

@@ -88,7 +88,6 @@
 			if (!vm.info.confirmDelete) vm.info.confirmDelete = true;
 			else{
 				Restangular.one('news',vm.info.news_id).remove().then(function(){
-				// vm.info.remove().then(function(){
 					toastr.success('News deleted successfuly','success');
 					$location.path("/news");
 				});

app/scripts/directives/main.js

@@ -62,9 +62,9 @@
 						ngModel.$setValidity('length', false);
 					}
 					if (value.match(/\d/)) {
-						ngModel.$setValidity('numeric', true);
+						ngModel.$setValidity('numerical', true);
 					} else {
-						ngModel.$setValidity('numeric', false);
+						ngModel.$setValidity('numerical', false);
 					}
 					if (value.match(/[a-z]/)) {
 						ngModel.$setValidity('lowercase', true);

app/views/dataset/view.html

@@ -191,7 +191,7 @@
 							<button class = 'btn btn-danger btn-xs' ng-if = 'vm.dataset.logged_permission >= 2' ng-click = 'file.delete = "w"'><span class = 'glyphicon glyphicon-remove-circle'></span></button>
 
 
-  							<button class="btn btn-xs btn-default" clipboard text="vm.dataset.files[$index].url" on-copied="vm.success(file.name)"  on-error="vm.fail(file.name)" ng-click='vm.geturl(file.file_id,file.access_code,$index,file.name)' ng-class="(vm.dataset.files[$index].highlight)?'btn-success':'btn-default'" popover-placement="left" uib-popover="{{vm.url}}/download/{{vm.dataset.dataset_id}}/{{file.file_id}}/{{file.access_code}}/{{file.name}}" popover-class="popoverurl" uib-tooltip="copy URL to clipboard"  popover-trigger = 'outsideClick' ng-disabled ="!file.access_code" popover-is-open="vm.dataset.files[$index].highlight"><span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span>
+													    							<button class="btn btn-xs btn-default" clipboard text="vm.dataset.files[$index].url" on-copied="vm.success(file.name)"  on-error="vm.fail(file.name)" ng-click='vm.geturl(file.file_id,file.access_code,$index,file.name)' ng-class="(vm.dataset.files[$index].highlight)?'btn-success':'btn-default'" popover-placement="left" uib-popover="{{vm.url}}/download/{{vm.dataset.dataset_id}}/{{file.file_id}}/{{file.access_code}}/{{file.name}}" popover-class="popoverurl" uib-tooltip="copy URL to clipboard"  popover-trigger = 'outsideClick' ng-disabled ="!file.access_code || vm.dataset.logged_permission < 2" popover-is-open="vm.dataset.files[$index].highlight"><span class="glyphicon glyphicon-paperclip" aria-hidden="true"></span>
 													    </button>
 
 						</span>

app/views/news/edit.html

@@ -50,7 +50,7 @@
 					<div class = 'col-sm-7'>
 						<div ng-if = '!vm.info.confirmDelete'>
 							<button type = 'submit' class = 'btn btn-success btn-sm' ng-disabled = 'formInfo.$invalid'>Submit</button>
-							<button type = 'delete' class = 'btn btn-danger btn-sm' ng-click = 'vm.deleteNews()' ng-if = 'vm.info.news_id > 0'>Delete</button>
+							<button type = 'button' class = 'btn btn-danger btn-sm' ng-click = 'vm.deleteNews()' ng-if = 'vm.info.news_id > 0'>Delete</button>
 							<a href="#/news" class="btn btn-link btn-sm">Cancel</a>
 						</div>
 						<div ng-if = 'vm.info.confirmDelete'>

package.json

@@ -2,7 +2,6 @@
   "name": "sibweb",
   "version": "0.0.0",
   "dependencies": {
-    "grunt-ng-annotate": "^1.0.1",
     "grunt-ng-constant": "^1.1.0"
   },
   "devDependencies": {
@@ -11,8 +10,8 @@
     "grunt-concurrent": "^0.5.0",
     "grunt-contrib-clean": "^0.5.0",
     "grunt-contrib-concat": "^0.4.0",
-    "grunt-contrib-copy": "^0.5.0",
     "grunt-contrib-connect": "^0.7.1",
+    "grunt-contrib-copy": "^0.5.0",
     "grunt-contrib-cssmin": "^0.9.0",
     "grunt-contrib-htmlmin": "^0.3.0",
     "grunt-contrib-imagemin": "^0.8.1",
@@ -23,7 +22,7 @@
     "grunt-google-cdn": "^0.4.0",
     "grunt-karma": "^0.12.0",
     "grunt-newer": "^0.7.0",
-    "grunt-ng-annotate": "^0.3.0",
+    "grunt-ng-annotate": "^1.0.1",
     "grunt-ng-constant": "^1.1.0",
     "grunt-svgmin": "^0.4.0",
     "grunt-usemin": "^2.1.1",