Skip to content

Commit

Permalink
Merge pull request #388 from AlexKvazos/master
Browse files Browse the repository at this point in the history
Hide header when `coontent.removeHeader` is true in plugin.json
  • Loading branch information
abuturla authored Nov 1, 2017
2 parents af81e5a + e5b0b66 commit 61f7b9a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions pluginTester/pages/controllers/shellCtrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ $app.controller('shellCtrl', ['$rootScope', '$scope', '$routeParams', '$sce', '$
if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
config = JSON.parse(xmlhttp.responseText);
$scope.pluginConfig = config;
$scope.$apply();

if (config.webpack) {
console.log('== LOADING WEBPACK PLUGIN ==');
Expand Down
8 changes: 4 additions & 4 deletions pluginTester/pages/templates/shell.html
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<div ng-controller="shellCtrl">
<div class="header clearfix">
<div class="header clearfix" ng-hide="pluginConfig.control.removeHeader">
<h4 class="margin-zero">Plugin</h4>
<input class="plugin-input margin-left-fifteen border-none border-radius-four" type="text" ng-cloak ng-model="navToValue" ng-keypress="navTo($event);" placeholder="Plugin Name">
<a href="#/login" ng-hide="currentUser" class="pull-right">Login</a>
<a href="#/logout" ng-show="currentUser" class="pull-right">Logout</a>
</div>
<div class="layout padded clearfix">
<div class="item clearfix row">
<div class="item clearfix row" ng-hide="pluginConfig.control.removeHeader">
<ol class="breadcrumb labels col-md-12 padding-right-zero pull-left">
<li ng-repeat="breadcrumb in breadcrumbs" ng-class="{'active':$last}">
<a ng-if="!$last" href="" ng-click="popHistoryItem($event, breadcrumb)">{{breadcrumb.label}}</a>
<span class="ellipsis" ng-if="$last" ng-bind="breadcrumb.label"></span>
</li>
</ol>
</div>
<ul class="nav nav-tabs nav-justified">
<ul class="nav nav-tabs nav-justified" ng-hide="pluginConfig.control.removeHeader">
<li ng-if="contentSrc">
<a id="btnLoadContent" class="active" ng-click="loadIFrame('content',$event)">Content</a>
</li>
Expand All @@ -33,4 +33,4 @@ <h4 class="margin-zero">Plugin</h4>
<iframe ng-hide="pluginControlIframeVisible" class="non-control-iframe" id="iframeNonControl" sandbox="allow-scripts allow-forms allow-same-origin allow-popups"
ng-src="{{currentNonControl}}"></iframe>
</div>
</div>
</div>

0 comments on commit 61f7b9a

Please sign in to comment.