← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to modules/layout-preview.twig

  • Committer: GitHub
  • Author(s): Dan Garner
  • Date: 2017-02-14 08:53:21 UTC
  • mfrom: (552.1.1)
  • Revision ID: git-v1:28b5a08b8293d0566da12863dbf2bde244f28804
Merge pull request #237 from maurofmferrao/develop

Complete conflict resolution for https://github.com/xibosignage/xibo-cms/pull/234

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/layout-preview.twig
16
16
        
17
17
        <link rel="shortcut icon" href="{{ theme.uri("img/favicon.ico") }}" />
18
18
        <link rel="stylesheet" type="text/css" href="{{ theme.uri("css/html-preview.css") }}" />
 
19
        <link rel="stylesheet" type="text/css" href="{{ theme.uri("libraries/font-awesome/css/font-awesome.min.css") }}" />
19
20
        
20
21
    </head>
21
22
    <body>
24
25
        <script src="{{ theme.uri("libraries/html5preloader/html5Preloader.js") }}"></script>
25
26
        <script src="{{ theme.uri("js/html-preview.js") }}"></script>
26
27
        <script type="text/javascript">
 
28
        
 
29
            var emptyRegionMessage = "{% trans "Empty Region" %}"; 
 
30
        
27
31
            (function($){
28
32
              $(document).ready(function(){
29
33
                dsInit({{ layout.layoutId }}, {{ previewOptions|json_encode()|raw }}, true)