Skip to content

Frameless widget #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FRSgit merged 1 commit into from
Sep 1, 2015
Merged

Frameless widget #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/scripts/provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ angular.module('adf.provider', [])
* if passed as a string.
* - `controllerAs` - `{string=}` - A controller alias name. If present the controller will be
* published to scope under the `controllerAs` name.
* - `frameless` - `{boolean=}` - false if the widget should be shown in frameless mode. The default is false.
* - `template` - `{string=|function()=}` - html template as a string.
* - `templateUrl` - `{string=}` - path to an html template.
* - `reload` - `{boolean=}` - true if the widget could be reloaded. The default is false.
Expand Down Expand Up @@ -94,7 +95,7 @@ angular.module('adf.provider', [])
* @returns {Object} self
*/
this.widget = function(name, widget){
var w = angular.extend({reload: false}, widget);
var w = angular.extend({reload: false, frameless: false}, widget);
if ( w.edit ){
var edit = {reload: true};
angular.extend(edit, w.edit);
Expand Down
4 changes: 4 additions & 0 deletions src/scripts/widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,10 @@ angular.module('adf')
definition.titleTemplateUrl = adfTemplatePath + 'widget-title.html';
}

if (!definition.titleTemplateUrl) {
definition.frameless = w.frameless;
}

// set id for sortable
if (!definition.wid) {
definition.wid = dashboard.id();
Expand Down
6 changes: 3 additions & 3 deletions src/templates/widget.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<div adf-id="{{definition.wid}}" adf-widget-type="{{definition.type}}" class="widget panel panel-default">
<div class="panel-heading clearfix">
<div adf-id="{{definition.wid}}" adf-widget-type="{{definition.type}}" ng-class="{'panel panel-default':!widget.frameless || editMode}" class="widget">
<div class="panel-heading clearfix" ng-if="!widget.frameless || editMode">
<div ng-include src="definition.titleTemplateUrl"></div>
</div>
<div class="panel-body" collapse="widgetState.isCollapsed">
<div ng-class="{'panel-body':!widget.frameless || editMode}" collapse="widgetState.isCollapsed">
<adf-widget-content model="definition" content="widget" />
</div>
</div>