From aa64743df50ca3b04c135001942fc3b05d048033 Mon Sep 17 00:00:00 2001 From: Lucas Constantino Date: Tue, 8 Jul 2014 14:19:32 -0300 Subject: [PATCH 1/3] Create new panel template for content only - no div arroud. --- applications/default/extensions/panel/panel.js | 1 + .../panel/public/templates/panel-content-no-html.html | 1 + applications/default/public/js/controllers.js | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 applications/default/extensions/panel/public/templates/panel-content-no-html.html diff --git a/applications/default/extensions/panel/panel.js b/applications/default/extensions/panel/panel.js index 83a4753..e4a8a42 100644 --- a/applications/default/extensions/panel/panel.js +++ b/applications/default/extensions/panel/panel.js @@ -167,6 +167,7 @@ panel.panel = function(panels, callback) { title: 'Brand', description: 'Application name or logo.', bare: true, + html: false, content: this.application.settings.application.name } diff --git a/applications/default/extensions/panel/public/templates/panel-content-no-html.html b/applications/default/extensions/panel/public/templates/panel-content-no-html.html new file mode 100644 index 0000000..3a7fbea --- /dev/null +++ b/applications/default/extensions/panel/public/templates/panel-content-no-html.html @@ -0,0 +1 @@ +{{panel.content}} diff --git a/applications/default/public/js/controllers.js b/applications/default/public/js/controllers.js index ebd35df..7ede9ed 100644 --- a/applications/default/public/js/controllers.js +++ b/applications/default/public/js/controllers.js @@ -56,7 +56,10 @@ function PanelController($scope, $location, $http, applicationState, Choko) { ViewController($scope, $location, $http, applicationState, Choko); } - if ($scope.panel.bare) { + if ($scope.panel.html === false) { + $scope.template = $scope.panel.template || 'templates/panel-content-no-html.html'; + } + else if ($scope.panel.bare) { $scope.template = $scope.panel.template || 'templates/panel-content.html'; } else { From 82d812fde1e25f9bf2ff9cdb5392fd74e49508ec Mon Sep 17 00:00:00 2001 From: Lucas Constantino Date: Thu, 10 Jul 2014 17:00:35 -0300 Subject: [PATCH 2/3] Removed changes to brand panel. --- applications/default/extensions/panel/panel.js | 1 - 1 file changed, 1 deletion(-) diff --git a/applications/default/extensions/panel/panel.js b/applications/default/extensions/panel/panel.js index e4a8a42..83a4753 100644 --- a/applications/default/extensions/panel/panel.js +++ b/applications/default/extensions/panel/panel.js @@ -167,7 +167,6 @@ panel.panel = function(panels, callback) { title: 'Brand', description: 'Application name or logo.', bare: true, - html: false, content: this.application.settings.application.name } From be98d188270cdec90b85dbe56a5617b972d840f4 Mon Sep 17 00:00:00 2001 From: Lucas Constantino Date: Thu, 10 Jul 2014 17:04:44 -0300 Subject: [PATCH 3/3] Make no html option be dependent of bare option. --- applications/default/public/js/controllers.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/applications/default/public/js/controllers.js b/applications/default/public/js/controllers.js index 7ede9ed..e444044 100644 --- a/applications/default/public/js/controllers.js +++ b/applications/default/public/js/controllers.js @@ -56,11 +56,12 @@ function PanelController($scope, $location, $http, applicationState, Choko) { ViewController($scope, $location, $http, applicationState, Choko); } - if ($scope.panel.html === false) { - $scope.template = $scope.panel.template || 'templates/panel-content-no-html.html'; - } - else if ($scope.panel.bare) { - $scope.template = $scope.panel.template || 'templates/panel-content.html'; + if ($scope.panel.bare) { + if ($scope.panel.html === false) { + $scope.template = $scope.panel.template || 'templates/panel-content-no-html.html'; + } else { + $scope.template = $scope.panel.template || 'templates/panel-content.html'; + } } else { $scope.template = 'templates/panel.html';