← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to lib/Controller/Layout.php

  • Committer: Dan Garner
  • Date: 2015-08-14 08:10:12 UTC
  • mfrom: (447.1.48)
  • Revision ID: git-v1:11ef90e0c8e85375d5f62b0f987a1e02b808f6ea
Merge pull request #97 from dasgarner/feature/playlists

First test fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Controller/Layout.php
101
101
        // Set up any JavaScript translations
102
102
        $data = [
103
103
            'layout' => $layout,
 
104
            'resolution' => ResolutionFactory::getByDimensions($layout->width, $layout->height),
104
105
            'layouts' => LayoutFactory::query(),
105
106
            'zoom' => Sanitize::getDouble('zoom', 1)
106
107
        ];
816
817
                break;
817
818
 
818
819
            case 3:
819
 
                $status = '<span title="' . __('This Layout is invalid and should not be scheduled') . '" class="glyphicon glyphicon-remove-sign"></span>';
 
820
                $status = '<span title="' . __('This Layout has not been built yet') . '" class="fa fa-cogs"></span>';
820
821
                break;
821
822
 
822
823
            default:
823
 
                $status = '<span title="' . __('The Status of this Layout is not known') . '" class="glyphicon glyphicon-warning-sign"></span>';
 
824
                $status = '<span title="' . __('This Layout is invalid and should not be scheduled') . '" class="glyphicon glyphicon-warning-sign"></span>';
824
825
        }
825
826
 
826
827
        // Keep things tidy