← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to views/base.twig

  • Committer: GitHub
  • Author(s): Dan Garner
  • Date: 2018-06-20 16:27:37 UTC
  • mfrom: (652)
  • mto: This revision was merged to the branch mainline in revision 653.
  • Revision ID: git-v1:1a1ca01506202d782ed245fa27b6ce6c32f0a216
Merge branch 'release18' into bugfix/1.8.10-pack2

Show diffs side-by-side

added added

removed removed

Lines of Context:
views/base.twig
10
10
 
11
11
        <link href="{{ theme.uri("libraries/bootstrap/css/bootstrap.min.css") }}?{{ version }}" rel="stylesheet" media="screen">
12
12
        <link href="{{ theme.uri("libraries/font-awesome/css/font-awesome.min.css") }}?{{ version }}" rel="stylesheet">
13
 
        <link href="{{ theme.uri("libraries/bootstrap-select/css/bootstrap-select.css") }}?{{ version }}" rel="stylesheet">
14
 
        <link href="{{ theme.uri("libraries/bootstrap-select-ajax/css/ajax-bootstrap-select.css") }}?{{ version }}" rel="stylesheet">
 
13
        <link href="{{ theme.uri("libraries/select2/css/select2.min.css") }}?{{ version }}" rel="stylesheet">
 
14
        <link href="{{ theme.uri("libraries/select2/css/select2-bootstrap.min.css") }}?{{ version }}" rel="stylesheet">
15
15
        <link href="{{ theme.uri("libraries/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css") }}?{{ version }}" rel="stylesheet">
16
16
        <link href="{{ theme.uri("libraries/jquery-timepicker/jquery.timepicker.css") }}?{{ version }}" rel="stylesheet">
17
17
        <link href="{{ theme.uri("libraries/bootstrap-slider-master/bootstrap-slider.min.css") }}?{{ version }}" rel="stylesheet">
60
60
        <script src="{{ theme.uri("libraries/jquery/jquery-ui/jquery-ui-1.10.2.custom.min.js") }}?{{ version }}"></script>
61
61
        <script src="{{ theme.uri("libraries/bootstrap-colorpicker/js/bootstrap-colorpicker.min.js") }}?{{ version }}"></script>
62
62
 
63
 
        <script src="{{ theme.uri("libraries/bootstrap-select/js/bootstrap-select.min.js") }}?{{ version }}"></script>
64
 
        <script src="{{ theme.uri("libraries/bootstrap-select-ajax/js/ajax-bootstrap-select.min.js") }}?{{ version }}"></script>
 
63
        <script src="{{ theme.uri("libraries/select2/js/select2.full.js") }}?{{ version }}"></script>
65
64
 
66
65
        <script src="{{ theme.uri("libraries/bootstrap-ekko-lightbox/ekko-lightbox.min.js") }}?{{ version }}"></script>
67
66
        <script src="{{ theme.uri("libraries/underscore/underscore-min.js") }}?{{ version }}"></script>
123
122
            <script src="{{ theme.uri(calendarTranslation) }}"></script>
124
123
            {% set datePickerTranslation %}libraries/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.{{ translate.jsLocale }}.js{% endset %}
125
124
            <script src="{{ theme.uri(datePickerTranslation) }}"></script>
126
 
            {% set selectPickerTranslation %}libraries/bootstrap-select/js/i18n/defaults-{{ translate.boostrapSelectLanguage }}.min.js{% endset %}
127
 
            <script src="{{ theme.uri(selectPickerTranslation) }}"></script>
128
 
            {% set selectPickerTranslation %}libraries/bootstrap-select-ajax/js/locale/ajax-bootstrap-select.{{ translate.calendarLanguage }}.min.js{% endset %}
 
125
            {% set selectPickerTranslation %}libraries/select2/js/i18n/{{ translate.jsLocale }}.js{% endset %}
129
126
            <script src="{{ theme.uri(selectPickerTranslation) }}"></script>
130
127
        {% endif %}
131
128
 
132
129
        <script type="text/javascript">
 
130
            // Default theme for select2
 
131
            $.fn.select2.defaults.set( "theme", "bootstrap" );
 
132
 
133
133
            var translations = {{ translations|raw }};
134
134
            // Translations we want always available
135
135
            {% autoescape "js" %}