← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to modules/forecastio-form-edit.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/forecastio-form-edit.twig
60
60
    ".locationControls": { "display": "none" }
61
61
    }
62
62
    },{
63
 
    "field": "templateId",
64
 
    "trigger": "init",
65
 
    "value": "picture",
66
 
    "operation": "equals",
67
 
    "actions": {
68
 
    ".icon-controls": { "display": "block" }
69
 
    }
70
 
    },{
71
 
    "field": "templateId",
72
 
    "trigger": "change",
73
 
    "value": "picture",
74
 
    "operation": "equals",
75
 
    "actions": {
76
 
    ".icon-controls": { "display": "block" }
77
 
    }
78
 
    },{
79
 
    "field": "templateId",
80
 
    "trigger": "init",
81
 
    "value": "picture",
82
 
    "operation": "not",
83
 
    "actions": {
84
 
    ".icon-controls": { "display": "none" }
85
 
    }
86
 
    },{
87
 
    "field": "templateId",
88
 
    "trigger": "change",
89
 
    "value": "picture",
90
 
    "operation": "not",
91
 
    "actions": {
92
 
    ".icon-controls": { "display": "none" }
93
 
    }
94
 
    },{
95
63
    "field": "overrideTemplate",
96
64
    "trigger": "init",
97
65
    "value": false,
209
177
                        {% set helpText %}{% trans "Select the template you would like to apply. This can be overridden using the check box below." %}{% endset %}
210
178
                        {{ forms.dropdown("templateId", "single", title, module.getOption("templateId"), module.templatesAvailable(), "id", "value", helpText, "template-selector-control selectPicker selectPickerWithImage", null, null, null, null, null, baseUrl, "image") }}
211
179
 
212
 
                        {% set title %}{% trans "Icons" %}{% endset %}
213
 
                        {% set helpText %}{% trans "Select the icon set you would like to use." %}{% endset %}
214
 
                        {{ forms.dropdown("icons", "single", title, module.getOption("icons"), module.iconsAvailable(), "id", "value", helpText, "icon-controls") }}
215
 
 
216
180
                        {% set title %}{% trans "Override the template?" %}{% endset %}
217
181
                        {% set helpText %}{% trans "Tick if you would like to override the template." %}{% endset %}
218
182
                        {{ forms.checkbox("overrideTemplate", title, module.getOption("overrideTemplate"), helpText) }}