← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to views/forms.twig

  • Committer: Dan Garner
  • Date: 2016-06-28 15:02:11 UTC
  • mto: This revision was merged to the branch mainline in revision 528.
  • Revision ID: git-v1:51031805c36c1d366fa330b2c2320d1927c57003
Fixes for upgrade steps

Show diffs side-by-side

added added

removed removed

Lines of Context:
views/forms.twig
49
49
    </div>
50
50
{% endmacro %}
51
51
 
52
 
{% macro inputWithButton(name, title, value, helpText, groupClass, validation, accessKey, buttonId, buttonTitle, buttonType, buttonLink) %}
53
 
    <div class="form-group {{ groupClass }}">
54
 
        <label class="col-sm-2 control-label" for="{{ name }}" accesskey="{{ accessKey }}">{{ title }}</label>
55
 
        <div class="col-sm-8" style="padding-right: 0;">
56
 
            <input class="form-control" name="{{ name }}" type="text" id="{{ name }}" value="{{ value }}" {{ validation }} />
57
 
            <span class="help-block">{{ helpText }}</span>
58
 
        </div>
59
 
        <div class="col-sm-2 text-right" style="padding-left: 0;">
60
 
            {% if buttonType == "link" %}
61
 
                <a class="btn btn-default" style="width:100%; padding: 6px 0px;" href="{{ link }}">{{ buttonTitle }}</a>
62
 
            {% else %}
63
 
                <button id="{{ buttonId }}" class="btn btn-default" style="width:100%; padding: 6px 0px;" type="{{ buttonType }}">{{ buttonTitle }}</button>
64
 
            {% endif %}
65
 
        </div>
66
 
    </div>
67
 
{% endmacro %}
68
 
 
69
 
{% macro inputWithTags(name, title, value, helpText, groupClass, validation, accessKey) %}
70
 
    <div class="form-group {{ groupClass }}">
71
 
        <label class="col-sm-2 control-label" for="{{ name }}" accesskey="{{ accessKey }}">{{ title }}</label>
72
 
        <div class="col-sm-10">
73
 
            <input class="form-control" name="{{ name }}" type="text" id="{{ name }}" value="{{ value }}" data-role="tagsInputForm" {{ validation }} />
74
 
            <span class="help-block">{{ helpText }}</span>
75
 
        </div>
76
 
    </div>
77
 
{% endmacro %}
78
 
 
79
52
{% macro number(name, title, value, helpText, groupClass, validation, accessKey) %}
80
53
    <div class="form-group {{ groupClass }}">
81
54
        <label class="col-sm-2 control-label" for="{{ name }}" accesskey="{{ accessKey }}">{{ title }}</label>
143
116
    </div>
144
117
{% endmacro %}
145
118
 
146
 
{% macro dropdown(name, type, title, value, options, optionId, optionValue, helpText, groupClass, validation, accessKey, callBack, dataAttributes, optionGroups, baseUrl, optionImageValue) %}
 
119
{% macro dropdown(name, type, title, value, options, optionId, optionValue, helpText, groupClass, validation, accessKey, callBack, dataAttributes, optionGroups) %}
147
120
    <div class="form-group {{ groupClass }}">
148
121
        <label class="col-sm-2 control-label" for="{{ name }}" title="{{ helpText }}" accesskey="{{ accessKey }}">{{ title }}</label>
149
122
        <div class="col-sm-10">
172
145
                    {% if optionId == "" %}
173
146
                        {% set itemOptionId = option %}
174
147
                        {% set itemOptionValue = option %}
175
 
                        {% if optionImageValue %}
176
 
                            {% set itemOptionImageValue = option %}
177
 
                        {% endif %}
178
148
                    {% else %}
179
149
                        {% set itemOptionId = attribute(option, optionId) %}
180
150
                        {% set itemOptionValue = attribute(option, optionValue) %}
181
 
                        {% if optionImageValue %}
182
 
                            {% set itemOptionImageValue = attribute(option, optionImageValue) %}
183
 
                        {% endif %}
184
151
                    {% endif %}
185
152
 
186
153
                    {% if type == "dropdownmulti" %}
189
156
                        {% set selected = (itemOptionId == value) %}
190
157
                    {% endif %}
191
158
 
192
 
                    <option value="{{ itemOptionId }}" {% if selected %}selected{% endif %}
193
 
                            {% if itemOptionImageValue %}
194
 
                                data-content="<span class='media'><span class='media-left'><img style='max-width: 100px' src='{{ baseUrl }}{{ itemOptionImageValue }}' /></span> <span class='media-body'>{{ itemOptionValue }}</span></span>"
195
 
                            {% endif %}
196
 
                    >{{ itemOptionValue }}</option>
 
159
                    <option value="{{ itemOptionId }}" {% if selected %}selected{% endif %}>{{ itemOptionValue }}</option>
197
160
                {% endfor %}
198
161
 
199
162
                {% if hasGroups %}
207
170
    </div>
208
171
{% endmacro %}
209
172
 
210
 
 
211
173
{% macro dateTime(name, title, value, helpText, groupClass, validation, accessKey) %}
212
 
    <div class="form-group dateTimePicker {{ groupClass }}" data-link-combined="{{ name }}">
 
174
    <div class="form-group {{ groupClass }}">
213
175
        <label class="col-sm-2 control-label" for="{{ name }}" accesskey="{{ accessKey }}">{{ title }}</label>
214
 
        <input type="hidden" name="{{ name }}" id="{{ name }}" value="{{ value }}" />
215
176
        <div class="col-sm-10">
216
 
            <div class="col-sm-2" style="padding: 0;">
217
 
                <input class="form-control dateTimePickerDate dateControl" name="{{ name }}_Link1" type="text" id="{{ name }}_Link1" {{ validation }} data-link-combined="{{ name }}" />
218
 
            </div>
219
 
            <div class="col-sm-10" style="padding: 0;">
220
 
                <input class="form-control dateTimePickerTime dateControl" name="{{ name }}_Link2" type="text" id="{{ name }}_Link2" {{ validation }} data-link-combined="{{ name }}" />
221
 
            </div>
 
177
            <input type="hidden" name="{{ name }}" id="{{ name }}" value="{{ value }}" />
 
178
            {% set linkedName %}{{ name }}Link{% endset %}
 
179
            <input class="form-control dateTimePicker dateControl" name="{{ linkedName }}" type="text" id="{{ linkedName }}" {{ validation }} data-link-field="{{ name }}" data-link-format="yyyy-mm-dd hh:ii:ss" />
222
180
            <span class="help-block">{{ helpText }}</span>
223
181
        </div>
224
182
    </div>
242
200
        <div class="col-sm-10">
243
201
            <input type="hidden" name="{{ name }}" id="{{ name }}" value="{{ value }}" />
244
202
            {% set linkedName %}{{ name }}Link{% endset %}
245
 
            <input class="form-control timePicker dateControl" name="{{ linkedName }}" type="text" id="{{ linkedName }}" {{ validation }} data-link-field="{{ name }}" data-link-format="hh:ii"/>
 
203
            <input class="form-control timePicker dateControl" name="{{ linkedName }}" type="text" id="{{ linkedName }}" {{ validation }} data-link-field="{{ name }}" data-link-format="hh:ii" readonly/>
246
204
            <span class="help-block">{{ helpText }}</span>
247
205
        </div>
248
206
    </div>