← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to views/display-form-edit.twig

  • 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:
views/display-form-edit.twig
32
32
                <li><a href="#wol" role="tab" data-toggle="tab"><span>{% trans "Wake on LAN" %}</span></a></li>
33
33
                <li><a href="#advanced" role="tab" data-toggle="tab"><span>{% trans "Advanced" %}</span></a></li>
34
34
            </ul>
35
 
            <form id="displayEditForm" class="XiboForm form-horizontal" method="put" action="{{ urlFor("display.edit") }}">
 
35
            <form id="displayEditForm" class="XiboForm form-horizontal" method="put" action="{{ urlFor("display.edit", {id: display.displayId}) }}">
36
36
                <div class="tab-content">
37
37
                    <div class="tab-pane active" id="general">
38
38
 
42
42
                
43
43
                        {% set title %}{% trans "Display's Hardware Key" %}{% endset %}
44
44
                        {% set helpText %}{% trans "A unique identifier for this display." %}{% endset %}
45
 
                        {{ forms.text("hardwareKey", title, display.license, helpText, "", "required", "", false) }}
 
45
                        {{ forms.text("license", title, display.license, helpText, "", "required", "", false) }}
46
46
 
47
47
                        {% set title %}{% trans "Description" %}{% endset %}
48
48
                        {% set helpText %}{% trans "A description - (1 - 254 characters)." %}{% endset %}
56
56
                        { licensedid: 1, licensed: yes },
57
57
                        { licensedid: 0, licensed: no }
58
58
                        ] %}
59
 
                        {{ forms.dropdown("licensed", "single", title, "", options, "licensedid", "licensed", helpText) }}
 
59
                        {{ forms.dropdown("licensed", "single", title, display.licensed, options, "licensedid", "licensed", helpText) }}
60
60
 
61
61
                        {% set title %}{% trans "Default Layout" %}{% endset %}
62
62
                        {% set helpText %}{% trans "The Default Layout to Display where there is no other content." %}{% endset %}
63
 
                        {{ forms.dropdown("defaultLayoutId", "single", title, "", layouts, "layoutid", "layout", helpText) }}
 
63
                        {{ forms.dropdown("defaultLayoutId", "single", title, display.defaultLayoutId, layouts, "layoutId", "layout", helpText) }}
64
64
                    </div>
65
65
                    <div class="tab-pane" id="location">
66
66
                        {% set title %}{% trans "Latitude" %}{% endset %}
115
115
 
116
116
                        {% set title %}{% trans "Settings Profile?" %}{% endset %}
117
117
                        {% set helpText %}{% trans "What display profile should this display use?" %}{% endset %}
118
 
                        {{ forms.dropdown("displayProfileId", "single", title, "", profiles, "displayprofileid", "name", helpText) }}
 
118
                        {{ forms.dropdown("displayProfileId", "single", title, display.displayProfileId, [{displayProfileId: null, name: ""}]|merge(profiles), "displayProfileId", "name", helpText) }}
119
119
 
120
120
 
121
121
                        {% set title %}{% trans "Interleave Default" %}{% endset %}
151
151
                            <tbody>
152
152
                                {% for item in settings %}
153
153
                                <tr>
154
 
                                    <td>{{item.name}}</td>
 
154
                                    <td>{{item.title}}</td>
155
155
                                    <td>{{item.valueString}}</td>
156
156
                                </tr>
157
157
                                {% endfor %}