fixed conflicts when merging

Author: tabacitu

CHANGELOG.md

@@ -20,6 +20,12 @@ All Notable changes to `Backpack CRUD` will be documented in this file
 - Nothing
 
 
+## [3.1.26] - 2016-09-30
+
+### Fixed
+- bug fix for 'table' field type - you can now have multiple fields on the same form;
+
+
 ## [3.1.25] - 2016-09-28
 
 ### Fixed

src/resources/views/create.blade.php

@@ -14,7 +14,7 @@
 @endsection
 
 @section('content')
-<div class="row">
+<div class="row" ng-app="backPack">
 	<div class="col-md-8 col-md-offset-2">
 		<!-- Default box -->
 		@if ($crud->hasAccess('list'))

src/resources/views/edit.blade.php

@@ -14,7 +14,7 @@
 @endsection
 
 @section('content')
-<div class="row">
+<div class="row" ng-app="backPack">
 	<div class="col-md-8 col-md-offset-2">
 		<!-- Default box -->
 		@if ($crud->hasAccess('list'))

src/resources/views/fields/table.blade.php

@@ -22,7 +22,7 @@
     }
 
 ?>
-<div ng-app="backpackTable" ng-controller="tableController" @include('crud::inc.field_wrapper_attributes') >
+<div ng-controller="tableController" @include('crud::inc.field_wrapper_attributes') >
 
     <label>{!! $field['label'] !!}</label>
 
@@ -66,7 +66,7 @@
 
         </table>
 
-        <div class="array-controls btn-group">
+        <div class="array-controls btn-group m-t-10">
             <button class="btn btn-sm btn-default" type="button" ng-click="addItem()"><i class="fa fa-plus"></i> Add {{ $item_name }}</button>
         </div>
 
@@ -96,11 +96,13 @@
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
         <script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/angular-ui-sortable/0.14.3/sortable.min.js"></script>
         <script>
-            angular.module('backpackTable', ['ui.sortable'], function($interpolateProvider){
+
+            window.angularApp = window.angularApp || angular.module('backPack', ['ui.sortable'], function($interpolateProvider){
                 $interpolateProvider.startSymbol('<%');
                 $interpolateProvider.endSymbol('%>');
-            })
-            .controller('tableController', function($scope){
+            });
+
+            window.angularApp.controller('tableController', function($scope){
 
                 $scope.sortableOptions = {
                     handle: '.sort-handle'

src/resources/views/list.blade.php

@@ -286,15 +286,15 @@ function register_details_row_button_action() {
 
             if ( row.child.isShown() ) {
                 // This row is already open - close it
-                $(this).children('i').removeClass('fa-minus-square-o').addClass('fa-plus-square-o');
+                $(this).removeClass('fa-minus-square-o').addClass('fa-plus-square-o');
                 $('div.table_row_slider', row.child()).slideUp( function () {
                     row.child.hide();
                     tr.removeClass('shown');
                 } );
             }
             else {
                 // Open this row
-                $(this).children('i').removeClass('fa-plus-square-o').addClass('fa-minus-square-o');
+                $(this).removeClass('fa-plus-square-o').addClass('fa-minus-square-o');
                 // Get the details with ajax
                 $.ajax({
                   url: '{{ Request::url() }}/'+btn.data('entry-id')+'/details',