diff --git a/vendor/hal-browser/.gitignore b/vendor/hal-browser/.gitignore deleted file mode 100644 index e43b0f988..000000000 --- a/vendor/hal-browser/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.DS_Store diff --git a/vendor/hal-browser/browser.html b/vendor/hal-browser/browser.html index 69edbbb18..b2d820ac1 100644 --- a/vendor/hal-browser/browser.html +++ b/vendor/hal-browser/browser.html @@ -3,7 +3,8 @@ The HAL Browser - - + - + -
-
-
- The HAL Browser -
- -
-
-
+ -
+
- - + @@ -260,4 +284,4 @@

Embedded Resources

$('#pactBrokerHomeLink').attr('href', baseUrl); //pact_broker - + \ No newline at end of file diff --git a/vendor/hal-browser/js/hal/http/client.js b/vendor/hal-browser/js/hal/http/client.js index 10bde7fd0..3088a54d1 100644 --- a/vendor/hal-browser/js/hal/http/client.js +++ b/vendor/hal-browser/js/hal/http/client.js @@ -1,6 +1,6 @@ HAL.Http.Client = function(opts) { this.vent = opts.vent; - this.defaultHeaders = { 'Accept': 'application/hal+json, application/json, */*; q=0.01', 'X-Interface': 'HAL Browser' }; //pact_broker + this.defaultHeaders = { 'Accept': 'application/hal+json, application/json, */*; q=0.01' }; cookie = document.cookie.match('(^|;)\\s*' + 'MyHalBrowserToken' + '\\s*=\\s*([^;]+)'); cookie ? this.defaultHeaders.Authorization = 'Bearer ' + cookie.pop() : ''; this.headers = this.defaultHeaders; @@ -23,7 +23,7 @@ HAL.Http.Client.prototype.get = function(url) { headers: jqXHR.getAllResponseHeaders() }); } - }).error(function() { + }).fail(function() { self.vent.trigger('fail-response', { jqxhr: jqxhr }); }); }; diff --git a/vendor/hal-browser/js/hal/views/browser.js b/vendor/hal-browser/js/hal/views/browser.js index 8b7390f9a..903888a7c 100644 --- a/vendor/hal-browser/js/hal/views/browser.js +++ b/vendor/hal-browser/js/hal/views/browser.js @@ -7,7 +7,7 @@ HAL.Views.Browser = Backbone.View.extend({ this.inspectorView = new HAL.Views.Inspector({ vent: this.vent }); }, - className: 'hal-browser row-fluid', + className: 'row', render: function() { this.$el.empty(); diff --git a/vendor/hal-browser/js/hal/views/embedded_resource.js b/vendor/hal-browser/js/hal/views/embedded_resource.js index 8b8187275..32a7dd6bc 100644 --- a/vendor/hal-browser/js/hal/views/embedded_resource.js +++ b/vendor/hal-browser/js/hal/views/embedded_resource.js @@ -21,7 +21,7 @@ HAL.Views.EmbeddedResource = Backbone.View.extend({ onToggleClick: function(e) { e.preventDefault(); - this.$accordionBody.collapse('toggle'); + this.$accordionBody.toggle(); return false; }, @@ -53,7 +53,7 @@ HAL.Views.EmbeddedResource = Backbone.View.extend({ $inner.append(embeddedResourcesView.el); } - this.$accordionBody = $('
'); + this.$accordionBody = $('
'); this.$accordionBody.append($inner) this.$el.append(this.$accordionBody); diff --git a/vendor/hal-browser/js/hal/views/explorer.js b/vendor/hal-browser/js/hal/views/explorer.js index b01d61359..026dfc42d 100644 --- a/vendor/hal-browser/js/hal/views/explorer.js +++ b/vendor/hal-browser/js/hal/views/explorer.js @@ -6,7 +6,7 @@ HAL.Views.Explorer = Backbone.View.extend({ this.resourceView = new HAL.Views.Resource({ vent: this.vent }); }, - className: 'explorer span6', + className: 'col-6', render: function() { this.navigationView.render(); diff --git a/vendor/hal-browser/js/hal/views/inspector.js b/vendor/hal-browser/js/hal/views/inspector.js index 6dfcf64d0..01e13a243 100644 --- a/vendor/hal-browser/js/hal/views/inspector.js +++ b/vendor/hal-browser/js/hal/views/inspector.js @@ -9,7 +9,7 @@ HAL.Views.Inspector = Backbone.View.extend({ this.vent.bind('response', this.renderResponse); }, - className: 'inspector span6', + className: 'col-6', render: function() { this.$el.html(this.template()); diff --git a/vendor/hal-browser/login.html b/vendor/hal-browser/login.html index 1284184ad..dafe2a297 100644 --- a/vendor/hal-browser/login.html +++ b/vendor/hal-browser/login.html @@ -5,7 +5,6 @@ Sign in - HAL Browser - - +