This repository has been archived by the owner on May 23, 2019. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 93
[Feature] Screen Saver #287
Closed
LuckyMallari
wants to merge
30
commits into
openhab:master
from
LuckyMallari:feature/dashboard-slideshow
Closed
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
d1be00d
Initial Commit of Dashboard Slideshow Feature
7f34a33
Initial work on settings
4565bf1
More development on settings page
4f83079
Formatted using Visual Studio Code
d1b46fa
Handle dashboard_control_item state change
5c8cd18
Added help text
96b6fd6
Fixes Back/Cancel text/logic
8599f48
Made dashboards draggable and sortable
ed6250b
Added logic to exclude dashboards
e39bb72
Changed going to settings to reload on Cancel->OK confirmation
dcc2928
Added code to check if a dashboard exists before switching to it.
c5c42f7
Broadcast ($rootScope.$broadcast) when configuration changed/loaded
1ed6535
Monitor config changes/loaded
d3af3c1
More user friendly error messages
ec175c9
Fixed admin.pot for header
a6da9bd
Tweaked styles
093a0fa
Fixed remainder of edits
3ab5985
Modified admin.pot and settings.html for text translations
b00dd43
Made _config a private member
7cbeb0e
More validation rules
38d7825
Fixed race condition on settings
55ac5c6
Remove db on onStop when db does not exist,
94bae22
Downgraded to ES5 from ES6
8c200b0
Ignore .bowerrc
cae1f9e
Removed ngAnimate
2c73218
const to var
61954cc
Style/Layout Changes
bda984c
Finalized scss
a728553
Added condition to show screensaver button on header
a3cfbef
More ES5 changes.
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,3 +11,4 @@ bower_components | |
.sass-cache | ||
nbproject | ||
coverage | ||
.bowerrc |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,8 @@ | |
'ngFileSaver', | ||
'snap', | ||
'tmh.dynamicLocale', | ||
'pascalprecht.translate' | ||
'pascalprecht.translate', | ||
'as.sortable' | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Still confident we can implement a sortable using just gridster and avoid a new dependency, I'll have a look ;) |
||
]) | ||
.config(['$routeProvider', 'localStorageServiceProvider', 'tmhDynamicLocaleProvider', '$translateProvider', '$translatePartialLoaderProvider', function($routeProvider, localStorageServiceProvider, tmhDynamicLocaleProvider, $translateProvider, $translatePartialLoaderProvider) { | ||
localStorageServiceProvider.setStorageType('localStorage'); | ||
|
@@ -180,6 +181,20 @@ | |
}] | ||
} | ||
}) | ||
.when('/settings/screensaver', { | ||
templateUrl: 'app/settings/settings.screensaver.html', | ||
controller: 'ScreensaverSettingsCtrl', | ||
resolve: { | ||
dashboards: ['PersistenceService', '$q', function (persistenceService, $q) { | ||
var dashboards = persistenceService.getDashboards(true); | ||
if (persistenceService.isEditingLocked()) return $q.reject("Editing is locked"); | ||
return dashboards; | ||
}], | ||
translations: ['TranslationService', function (TranslationService) { | ||
return TranslationService.enterPart('admin'); | ||
}] | ||
} | ||
}) | ||
.otherwise({ | ||
redirectTo: '/' | ||
}); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,6 @@ | |
<a class="btn pull-left" title="Menu" snap-toggle="left"> | ||
<i class="glyphicon glyphicon-menu-hamburger"></i> | ||
</a> | ||
|
||
<a class="btn pull-right" ng-click="vm.goFullscreen()" title="{{vm.fullscreenTooltip}}" ng-if="!settings.hide_fullscreen_button && !vm.dashboard.header.use_custom_widget"> | ||
<i class="glyphicon glyphicon-resize-full"></i> | ||
</a> | ||
|
@@ -15,6 +14,9 @@ | |
title="{{vm.speakTooltip}}"> | ||
<i class="glyphicon" ng-class="vm.isListening ? 'glyphicon-stop' : 'glyphicon-comment'"></i> | ||
</a> | ||
<a class="btn pull-right" ng-if="vm.isScreensaverEnabled()" ng-click="vm.startScreensaver()" title="{{vm.startscreensaverToolTip}}" ng-if="!settings.hide_screensaver_button && !vm.dashboard.header.use_custom_widget"> | ||
<i class="glyphicon glyphicon-play" ng-class="{'text-success':vm.isScreensaverRunning()}"></i> | ||
</a> | ||
<h2 class="dashboard-title" ng-if="!vm.dashboard.header.use_custom_widget"> | ||
<small class="header-clock" ng-if="settings.show_header_clock"><ds-widget-clock show-digital digital-format="settings.header_clock_format || 'shortTime'"></ds-widget-clock></small> | ||
<span>{{vm.dashboard.name}} | ||
|
@@ -40,7 +42,7 @@ <h2 class="dashboard-title" ng-if="!vm.dashboard.header.use_custom_widget"> | |
tooltip-placement="top"> | ||
<i class="glyphicon" ng-class="vm.isListening ? 'glyphicon-stop' : 'glyphicon-comment'"></i> | ||
</a> | ||
<div class="scrollable" ng-show="vm.ready" gridster="vm.gridsterOptions"> | ||
<div class="scrollable widget-container" ng-show="vm.ready" gridster="vm.gridsterOptions"> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. New class? Is this needed? |
||
<ul> | ||
<li gridster-item="widget" ng-repeat="widget in vm.dashboard.widgets"> | ||
<div class="box" ng-style="{'font-size': vm.dashboard.font_scale ? vm.dashboard.font_scale + '%' : undefined }"> | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe the docs could use a new paragraph for the new settings screen :)