Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion control/content/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<hr class="none">
<div class="item clearfix row">
<div class="main col-md-12 pull-left">
<textarea id="text" ui-tinymce class="form-control" rows="5" width="100%" ng-model="data.content.text"></textarea>
<textarea id="text" ui-tinymce="editorOptions" class="form-control" rows="5" width="100%" ng-model="data.content.text"></textarea>
</div>
</div>

Expand All @@ -48,6 +48,13 @@
var folderPluginApp = angular.module('folderPlugin', ['ui.tinymce']);

folderPluginApp.controller('folderPluginCtrl', ['$scope', function ($scope) {
$scope.editorOptions = {
plugins: 'advlist autolink link image lists charmap print preview',
skin: 'lightgray',
trusted: true,
theme: 'modern'
};

// create a new instance of the buildfire carousel editor
var editor = new buildfire.components.carousel.editor("#carousel");
var plugins = new buildfire.components.pluginInstance.sortableList("#plugins", []);
Expand Down
4 changes: 4 additions & 0 deletions widget/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
.overlay.background img {
height: 100%;
}

.layout-6 .list-item-media {
background-color: transparent !important;
}
</style>
<div class="overlay background" ng-if="data.design.backgroundImage && deviceWidth != 0 && deviceHeight != 0">
<img ng-src="{{ cropImage(data.design.backgroundImage, {width: deviceWidth, height: deviceHeight}) }}"
Expand Down
2 changes: 1 addition & 1 deletion widget/templates/layout4.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<img ng-src="{{ cropImage(plugin.iconUrl? plugin.iconUrl : 'http://www.placehold.it/450x254', {width: 450, height: 254}) }}">
</div>
<div class="info-bar bg-primary">
<p class="margin-bottom-zero col-md-12 ellipsis">{{ plugin.title }}</p>
<p class="margin-bottom-zero col-md-12 ellipsis titleBarTextAndIcons">{{ plugin.title }}</p>
</div>
</div>
2 changes: 1 addition & 1 deletion widget/templates/layout5.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<img ng-src="{{ cropImage(plugin.iconUrl? plugin.iconUrl : 'http://www.placehold.it/200x200', {width: 200, height: 200}) }}">
</div>
<div class="info-bar bg-primary">
<p class="margin-bottom-zero col-md-12 ellipsis">
<p class="margin-bottom-zero col-md-12 ellipsis titleBarTextAndIcons">
{{ plugin.title }}
</p>
</div>
Expand Down
6 changes: 3 additions & 3 deletions widget/templates/layout6.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<div class="padded padding-top-zero">
<div class="list-layout">
<div class="list-layout layout-6">
<div ng-repeat="pluginRow in data.plugins" class="row">
<div class="list-item col-xs-6 pull-left" ng-repeat="plugin in pluginRow" ng-click="navigateToPlugin(plugin)">
<div class="list-item-media text-center border-radius-three overflow-hidden">
<div class="list-media-holder">
<img ng-src="{{ cropImage(plugin.iconUrl? plugin.iconUrl : 'http://www.placehold.it/200x200', {width: 200, height: 200}) }}">
</div>
<div class="list-item-copy text-left">
<p cclass="ellipsis margin-zero text-primary text-center">
<div class="list-item-copy text-center" style="min-height: 42px;">
<p cclass="ellipsis margin-zero text-primary">
<a class="text-primary">
{{ plugin.title }}
</a>
Expand Down