Skip to content

Commit 42a7df8

Browse files
maurofmferraomaurofmferrao
committed
Upgrade Bootstrap
resolves xibosignage/xibo#2361 - Tabs and forms
1 parent a0ccc9b commit 42a7df8

File tree

183 files changed

+1059
-989
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+1059
-989
lines changed

‎modules/audio-form-edit.twig

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<div class="row">
3333
<div class="col-md-12">
3434
<ul class="nav nav-tabs" role="tablist">
35-
<li class="active"><a href="#generalTab" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
35+
<li class="nav-item"><a class="nav-link active" href="#generalTab" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
3636
</ul>
3737
<form id="audioEditForm" class="XiboForm form-horizontal" method="put" action="{{ url_for("module.widget.edit", {id: module.widget.widgetId}) }}" data-widget-id="{{ module.widget.widgetId }}" data-media-id="{{ module.getMediaId() }}" data-media-editable="{{ currentUser.checkEditable(module.getMedia()) }}" data-valid-extensions="{{ validExtensions }}" data-media-duration="{{ media.duration }}">
3838
<div class="tab-content">

‎modules/calendar-form-edit.twig

+7-7
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
<div class="row">
3333

3434
<ul class="nav nav-tabs" role="tablist">
35-
<li class="active"><a href="#generalTab" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
36-
<li><a href="#configurationTab" role="tab" data-toggle="tab"><span>{% trans "Configuration" %}</span></a></li>
37-
<li><a href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
38-
<li class="dropdown">
39-
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
35+
<li class="nav-item"><a class="nav-link active" href="#generalTab" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
36+
<li class="nav-item"><a class="nav-link" href="#configurationTab" role="tab" data-toggle="tab"><span>{% trans "Configuration" %}</span></a></li>
37+
<li class="nav-item"><a class="nav-link" href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
38+
<li class="nav-item dropdown">
39+
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
4040
{% trans "Templates" %}<span class="caret"></span>
4141
</a>
4242
<div class="dropdown-menu">
@@ -46,8 +46,8 @@
4646
<a class="dropdown-item" href="#optionalStylesheetTab" role="tab" data-toggle="tab"><span>{% trans "Optional Stylesheet" %}</span></a>
4747
</div>
4848
</li>
49-
<li><a href="#cachingTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
50-
<li><a href="#triggerTab" role="tab" data-toggle="tab"><span>{% trans "Trigger" %}</span></a></li>
49+
<li class="nav-item"><a class="nav-link" href="#cachingTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
50+
<li class="nav-item"><a class="nav-link" href="#triggerTab" role="tab" data-toggle="tab"><span>{% trans "Trigger" %}</span></a></li>
5151
</ul>
5252

5353
<div class="col-md-12">

‎modules/chart-form-edit.twig

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,28 +33,28 @@
3333
{% block formHtml %}
3434
<div class="row">
3535
<ul class="nav nav-tabs" role="tablist">
36-
<li class="active"><a href="#general" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
37-
<li class="dropdown">
38-
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
36+
<li class="nav-item"><a class="nav-link active" href="#general" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
37+
<li class="nav-item dropdown">
38+
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
3939
{% trans "Configuration" %}<span class="caret"></span>
4040
</a>
4141
<div class="dropdown-menu">
4242
<a class="dropdown-item" href="#dataTab" role="tab" data-toggle="tab"><span>{% trans "Data" %}</span></a>
4343
<a class="dropdown-item" href="#labelsTab" role="tab" data-toggle="tab"><span>{% trans "Labels" %}</span></a>
4444
</div>
4545
</li>
46-
<li class="dropdown">
47-
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
46+
<li class="nav-item dropdown">
47+
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
4848
{% trans "Appearance" %}<span class="caret"></span>
4949
</a>
5050
<div class="dropdown-menu">
5151
<a class="dropdown-item" href="#styleTab" role="tab" data-toggle="tab"><span>{% trans "Style" %}</span></a>
5252
<a class="dropdown-item" href="#colourPalletTab" role="tab" data-toggle="tab"><span>{% trans "Colour Palette" %}</span></a>
5353
</div>
5454
</li>
55-
<li><a href="#orderCriteria" role="tab" data-toggle="tab"><span>{% trans "Order" %}</span></a></li>
56-
<li><a href="#filterCriteria" role="tab" data-toggle="tab"><span>{% trans "Filter" %}</span></a></li>
57-
<li><a href="#cacheTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
55+
<li class="nav-item"><a class="nav-link" href="#orderCriteria" role="tab" data-toggle="tab"><span>{% trans "Order" %}</span></a></li>
56+
<li class="nav-item"><a class="nav-link" href="#filterCriteria" role="tab" data-toggle="tab"><span>{% trans "Filter" %}</span></a></li>
57+
<li class="nav-item"><a class="nav-link" href="#cacheTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
5858
</ul>
5959

6060
<div class="col-md-12">

‎modules/clock-form-edit.twig

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
{% block formHtml %}
3232
<div class="row">
3333
<ul class="nav nav-tabs" role="tablist">
34-
<li class="active"><a href="#generalTab" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
35-
<li><a href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
36-
<li><a href="#editorTab" class="digital-control-group" role="tab" data-toggle="tab"><span>{% trans "Editor" %}</span></a></li>
34+
<li class="nav-item"><a class="nav-link active" href="#generalTab" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
35+
<li class="nav-item"><a class="nav-link" href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
36+
<li class="nav-item"><a class="nav-link" href="#editorTab" class="digital-control-group" role="tab" data-toggle="tab"><span>{% trans "Editor" %}</span></a></li>
3737
</ul>
3838
<div class="col-md-12">
3939
<form id="clockFormEdit" class="XiboForm form-horizontal" method="put" action="{{ url_for("module.widget.edit", {id: module.widget.widgetId}) }}">
@@ -137,7 +137,7 @@
137137
</div>
138138

139139
<div class="ckeditor_controls inline-editor-hide container-fluid" data-linked-to="ta_text">
140-
<div class="col-sm-offset-4 col-sm-8">
140+
<div class="offset-sm-4 col-sm-8">
141141
<div class="form-group">
142142
<label class="col-sm-4 control-label" for="ckeditor_snippets_select">{% trans "Snippets" %}</label>
143143
<div class="col-sm-8 ckeditor_select_container">

‎modules/countdown-form-edit.twig

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@
3333
{% block formHtml %}
3434
<div class="row">
3535
<ul class="nav nav-tabs" role="tablist">
36-
<li class="active"><a href="#generalTab" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
37-
<li><a href="#configurationTab" role="tab" data-toggle="tab"><span>{% trans "Configuration" %}</span></a></li>
38-
<li class="dropdown">
39-
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
36+
<li class="nav-item"><a class="nav-link active" href="#generalTab" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
37+
<li class="nav-item"><a class="nav-link" href="#configurationTab" role="tab" data-toggle="tab"><span>{% trans "Configuration" %}</span></a></li>
38+
<li class="nav-item dropdown">
39+
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
4040
{% trans "Templates" %}<span class="caret"></span>
4141
</a>
4242
<div class="dropdown-menu">
@@ -141,7 +141,7 @@
141141
</div>
142142

143143
<div class="ckeditor_controls container-fluid" data-linked-to="mainTemplate">
144-
<div class="col-sm-offset-4 col-sm-8">
144+
<div class="offset-sm-4 col-sm-8">
145145
<div class="form-group">
146146
<label class="col-sm-4 control-label" for="ckeditor_snippets_select">{% trans "Snippets" %}</label>
147147
<div class="col-sm-8 ckeditor_select_container">

‎modules/currencies-form-edit.twig

+7-7
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
{% block formHtml %}
3838
<div class="row">
3939
<ul class="nav nav-tabs" role="tablist">
40-
<li class="active"><a href="#general" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
41-
<li><a href="#configurationTab" role="tab" data-toggle="tab" data-enlarge="1"><span>{% trans "Configuration" %}</span></a></li>
42-
<li><a href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
43-
<li class="dropdown">
44-
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
40+
<li class="nav-item"><a class="nav-link active" href="#general" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
41+
<li class="nav-item"><a class="nav-link" href="#configurationTab" role="tab" data-toggle="tab" data-enlarge="1"><span>{% trans "Configuration" %}</span></a></li>
42+
<li class="nav-item"><a class="nav-link" href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
43+
<li class="nav-item dropdown">
44+
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
4545
{% trans "Templates" %}<span class="caret"></span>
4646
</a>
4747
<div class="dropdown-menu">
@@ -52,8 +52,8 @@
5252
<a class="dropdown-item" href="#noRecordsMessageTab" role="tab" data-toggle="tab"><span>{% trans "No Records Message" %}</span></a>
5353
</div>
5454
</li>
55-
<li><a href="#cachingTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
56-
<li><a href="#results" role="tab" data-toggle="tab"><span>{% trans "Results" %}</span></a></li>
55+
<li class="nav-item"><a class="nav-link" href="#cachingTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
56+
<li class="nav-item"><a class="nav-link" href="#results" role="tab" data-toggle="tab"><span>{% trans "Results" %}</span></a></li>
5757
</ul>
5858
<div class="col-md-12">
5959
<form id="currenciesEditForm" class="XiboForm form-horizontal" method="put" action="{{ url_for("module.widget.edit", {id: module.widget.widgetId}) }}">

‎modules/currencies/currencies1.template.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"id": "currencies1",
33
"value": "Currencies 1",
4-
"main": "<div class=\"container-main\">\r\n <div class=\"container \">\r\n <div class=\"row row-header\">\r\n <div class=\"col-xs-2 col-xs-offset-10 text-center value\">||RATE||<\/div>\r\n <\/div>\r\n <div id=\"cycle-container\">\r\n [itemsTemplate]\r\n <\/div>\r\n <\/div>\r\n<\/div>",
5-
"item": "<div class=\"row row-finance\">\r\n <div class=\"col-xs-1 flags\">\r\n <img class=\"img-circle center-block \" src=\"[CurrencyFlag]\">\r\n <\/div>\r\n <div class=\"col-xs-3 value \">[NameShort]<\/div>\r\n <div class=\"col-xs-2 col-xs-offset-6 text-center value\">[LastTradePriceOnly]<\/div>\r\n<\/div>",
4+
"main": "<div class=\"container-main\">\r\n <div class=\"container \">\r\n <div class=\"row row-header\">\r\n <div class=\"col-xs-2 offset-xs-10 text-center value\">||RATE||<\/div>\r\n <\/div>\r\n <div id=\"cycle-container\">\r\n [itemsTemplate]\r\n <\/div>\r\n <\/div>\r\n<\/div>",
5+
"item": "<div class=\"row row-finance\">\r\n <div class=\"col-xs-1 flags\">\r\n <img class=\"img-circle center-block \" src=\"[CurrencyFlag]\">\r\n <\/div>\r\n <div class=\"col-xs-3 value \">[NameShort]<\/div>\r\n <div class=\"col-xs-2 offset-xs-6 text-center value\">[LastTradePriceOnly]<\/div>\r\n<\/div>",
66
"css": "body {\r\n font-family: \"Helvetica\", \"Arial\", sans-serif;\r\n line-height: 1;\r\n}\r\n\r\n.container-main {\r\n height: 420px !important;\r\n width: 820px !important;\r\n}\r\n\r\n.container {\r\n height: 420px !important;\r\n width: 820px !important;\r\n float: left;\r\n margin-top: 20px;\r\n}\r\n\r\n.row-finance {\r\n height: 60px;\r\n background: rgba(0, 0, 0, 0.87);\r\n margin-bottom: 20px;\r\n}\r\n\r\n.row {\r\n margin-right: 0;\r\n margin-left: 0;\r\n}\r\n\r\n.row-header {\r\n margin-right: -15px;\r\n margin-left: -15px;\r\n margin-bottom: 20px;\r\n}\r\n\r\n#cycle-container {\r\n margin-left: -15px;\r\n margin-right: -15px;\r\n}\r\n\r\n.value {\r\n font-size: 20px;\r\n padding-top: 20px;\r\n font-weight: bold;\r\n color: #fff;\r\n}\r\n\r\n.down-arrow {\r\n font-size: 20px;\r\n color: red;\r\n padding-top: 17px;\r\n}\r\n\r\n.up-arrow {\r\n font-size: 20px;\r\n color: green;\r\n padding-top: 17px;\r\n}\r\n\r\n.variant {\r\n font-size: 20px;\r\n padding-top: 17px;\r\n}\r\n\r\n.flags {\r\n padding-top: 4px;\r\n}\r\n\r\n.center-block {\r\n width: 50px;\r\n height: 50px;\r\n}",
77
"maxItemsPerPage": 4,
88
"widgetOriginalWidth": "820",

‎modules/datasetticker-form-edit.twig

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,11 @@
3333
{% block formHtml %}
3434
<div class="row">
3535
<ul class="nav nav-tabs" role="tablist">
36-
<li class="active"><a href="#general" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
37-
<li><a href="#configurationTab" role="tab" data-toggle="tab"><span>{% trans "Configuration" %}</span></a></li>
38-
<li><a href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
39-
<li class="dropdown">
40-
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
36+
<li class="nav-item"><a class="nav-link active" href="#general" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
37+
<li class="nav-item"><a class="nav-link" href="#configurationTab" role="tab" data-toggle="tab"><span>{% trans "Configuration" %}</span></a></li>
38+
<li class="nav-item"><a class="nav-link" href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
39+
<li class="nav-item dropdown">
40+
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
4141
{% trans "Templates" %}<span class="caret"></span>
4242
</a>
4343
<div class="dropdown-menu">
@@ -47,9 +47,9 @@
4747
<a class="dropdown-item" href="#optionalJavascriptTab" role="tab" data-toggle="tab"><span>{% trans "Optional JavaScript" %}</span></a>
4848
</div>
4949
</li>
50-
<li><a href="#orderCriteria" role="tab" data-toggle="tab"><span>{% trans "Order" %}</span></a></li>
51-
<li><a href="#filterCriteria" role="tab" data-toggle="tab"><span>{% trans "Filter" %}</span></a></li>
52-
<li><a href="#cachingTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
50+
<li class="nav-item"><a class="nav-link" href="#orderCriteria" role="tab" data-toggle="tab"><span>{% trans "Order" %}</span></a></li>
51+
<li class="nav-item"><a class="nav-link" href="#filterCriteria" role="tab" data-toggle="tab"><span>{% trans "Filter" %}</span></a></li>
52+
<li class="nav-item"><a class="nav-link" href="#cachingTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
5353
</ul>
5454
<div class="col-md-12">
5555
<form id="dataSetTickerForm2" class="XiboForm form-horizontal" data-form-step="2" method="put" action="{{ url_for("module.widget.edit", {id: module.widget.widgetId}) }}">

‎modules/datasetview-form-edit.twig

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
{% block formHtml %}
3535
<div class="row">
3636
<ul class="nav nav-tabs" role="tablist">
37-
<li class="active"><a href="#general" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
38-
<li><a href="#configurationTab" role="tab" data-toggle="tab"><span>{% trans "Configuration" %}</span></a></li>
39-
<li><a href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
40-
<li class="dropdown">
41-
<a class="dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
37+
<li class="nav-item"><a class="nav-link active" href="#general" role="tab" data-toggle="tab"><span>{% trans "General" %}</span></a></li>
38+
<li class="nav-item"><a class="nav-link" href="#configurationTab" role="tab" data-toggle="tab"><span>{% trans "Configuration" %}</span></a></li>
39+
<li class="nav-item"><a class="nav-link" href="#appearanceTab" role="tab" data-toggle="tab"><span>{% trans "Appearance" %}</span></a></li>
40+
<li class="nav-item dropdown">
41+
<a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false">
4242
{% trans "Templates" %}<span class="caret"></span>
4343
</a>
4444
<div class="dropdown-menu">
@@ -47,9 +47,9 @@
4747
<a class="dropdown-item" href="#optionalJavascriptTab" role="tab" data-toggle="tab"><span>{% trans "Optional JavaScript" %}</span></a>
4848
</div>
4949
</li>
50-
<li><a href="#orderCriteria" role="tab" data-toggle="tab"><span>{% trans "Order" %}</span></a></li>
51-
<li><a href="#filterCriteria" role="tab" data-toggle="tab"><span>{% trans "Filter" %}</span></a></li>
52-
<li><a href="#cachingTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
50+
<li class="nav-item"><a class="nav-link" href="#orderCriteria" role="tab" data-toggle="tab"><span>{% trans "Order" %}</span></a></li>
51+
<li class="nav-item"><a class="nav-link" href="#filterCriteria" role="tab" data-toggle="tab"><span>{% trans "Filter" %}</span></a></li>
52+
<li class="nav-item"><a class="nav-link" href="#cachingTab" role="tab" data-toggle="tab"><span>{% trans "Caching" %}</span></a></li>
5353
</ul>
5454
<div class="col-md-12">
5555
<form id="dataSetViewEditForm2" class="XiboForm form-horizontal" data-form-step="2" method="put" action="{{ url_for("module.widget.edit", {id: module.widget.widgetId}) }}">

0 commit comments

Comments
 (0)