Skip to content

Commit 8dbb52e

Browse files
degratnikdegratnik
authored
Merge pull request #178 from ticketmaster-api/odev21122016
Odev21122016
2 parents 324ee62 + af22272 commit 8dbb52e

88 files changed

Lines changed: 32537 additions & 1157 deletions

File tree

Some content is hidden

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

‎Rakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace 'travis' do
2323
resultG = system("sh ./tests/run-test-dispatch.sh")
2424
puts resultG
2525
puts 'test result'
26-
if (resultS and resultG) == false
26+
if (resultS) == false
2727
puts 'test failed'
2828
exit 1
2929
end

‎_includes/disqus.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
<script>
33
// Global discus config func.
44
window.disqus_config = function () {
5-
this.page.url = document.URL || "http://developer.ticketmaster.com/";
5+
if (window.location.hostname != 'developer.ticketmaster.com') {
6+
var pageURL = window.location.href.replace(window.location.host, 'developer.ticketmaster.com');
7+
this.page.url = pageURL || "http://developer.ticketmaster.com/";
8+
}
9+
else this.page.url = document.URL || "http://developer.ticketmaster.com/";
610
this.page.identifier = "{{page.title}}";
711
};
812
(function() { // DON'T EDIT BELOW THIS LINE
@@ -11,4 +15,4 @@
1115
s.setAttribute('data-timestamp', + new Date());
1216
(d.head || d.body).appendChild(s);
1317
})();
14-
</script>
18+
</script>

‎_includes/feedback.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h3 class="modal-title col-lg-12">Leave Your Feedback</h3>
1111
</div>
1212
<div class="modal-body">
1313

14-
<form id="js_feedback_form" accept-charset="UTF-8" action="http://getsimpleform.com/messages/ajax?form_api_token=d9878ccc8e22c7253d057015617f82cd" method="POST">
14+
<form id="js_feedback_form" accept-charset="UTF-8" action="https://getsimpleform.com/messages/ajax?form_api_token=d9878ccc8e22c7253d057015617f82cd" method="POST">
1515
<div class="col-lg-6">
1616
<label for="name">Your name</label>
1717
<input required type="text" id="name" name="name" maxlength="255" autofocus >

‎_includes/partials/expanded-menu-header.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ <h4>WIDGETS</h4>
101101
<a href="/products-and-docs/widgets/wordpress/">WordPress Widget</a>
102102
</li>
103103
<li>
104-
<a href="/products-and-docs/widgets/">Direct Payments</a>
104+
<a href="https://www.universe.com/directpayments">Direct Payments</a>
105105
</li>
106106
</ul>
107107
</div>

‎_includes/pd-side-menu.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,11 +292,11 @@ <h4><a href="/products-and-docs/sdks/" {% if page.categories[0] == "documentatio
292292
<h4><a href="/products-and-docs/widgets/" {% if page.categories[0] == "documentation" and page.categories[1] == "widgets" %} class="active" {% endif %} >Widgets</a></h4>
293293
{% if page.categories[0] == "documentation" and page.categories[1] == "widgets" %}
294294
<ul class="categories menu-highlight">
295-
<li><a href="/products-and-docs/widgets/checkout/">Ticketmaster Universal Checkout</a></li>
296-
<li><a href="/products-and-docs/widgets/event-discovery/">Event Discovery Widget</a></li>
297-
<li><a href="/products-and-docs/widgets/countdown/">Countdown Widget</a></li>
298-
<li><a href="/products-and-docs/widgets/calendar/">Calendar Widget</a></li>
299-
<li><a href="/products-and-docs/widgets/wordpress/">WordPress Widget</a></li>
295+
<li><a href="/products-and-docs/widgets/checkout/"{% if page.categories[2] == "widget-checkout"%} class="active" {% endif %}>Ticketmaster Universal Checkout</a></li>
296+
<li><a href="/products-and-docs/widgets/event-discovery/"{% if page.categories[2] == "widget-event-discovery"%} class="active" {% endif %}>Event Discovery Widget</a></li>
297+
<li><a href="/products-and-docs/widgets/countdown/"{% if page.categories[2] == "widget-countdown"%} class="active" {% endif %}>Countdown Widget</a></li>
298+
<li><a href="/products-and-docs/widgets/calendar/"{% if page.categories[2] == "widget-calendar"%} class="active" {% endif %}>Calendar Widget</a></li>
299+
<li><a href="/products-and-docs/widgets/wordpress/"{% if page.categories[2] == "widget-wordpress"%} class="active" {% endif %}>WordPress Widget</a></li>
300300
<li><a href="https://www.universe.com/directpayments">Direct Payments</a></li>
301301
</ul>
302302
{% endif %}

‎_includes/widget-calendar-config.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
API Key <span class="config_field__description">(Required)</span>
2323
</label>
2424
<a href="https://developer-acct.ticketmaster.com/user/login" class="pull-right">Get your own</a>
25-
<div class="widget_api_key__field">
25+
<div class="widget_api_key__field" id="js_custom_select_key">
2626
<input type="text" id="w-tm-api-key" name="w-tm-api-key" value="">
2727
<a href="/support/faq/" class="widget_api_key__question"></a>
2828
</div>

‎_includes/widget-config.html‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
API Key <span class="config_field__description">(Required)</span>
2323
</label>
2424
<a href="https://developer-acct.ticketmaster.com/user/login" class="pull-right">Get your own</a>
25-
<div class="widget_api_key__field">
25+
<div class="widget_api_key__field" id="js_custom_select_key">
2626
<input type="text" id="w-tm-api-key" name="w-tm-api-key" value="">
2727
<a href="/support/faq/" class="widget_api_key__question"></a>
2828
</div>
@@ -115,17 +115,17 @@
115115
<label for="w-countryCode">Country Code</label>
116116
<div class="js_custom_select custom_select">
117117
<select id="w-countryCode" class="custom_select__field" name="w-countryCode" tabindex="-1">
118-
<option value="" ></option>
118+
<option value="" >none</option>
119119
<option value="AU">Australia</option>
120120
<option value="CA">Canada</option>
121121
<option value="GB ">Great Britain</option>
122122
<option value="IE">Ireland</option>
123123
<option value="NZ">New Zealand</option>
124124
<option value="US ">United States</option>
125125
</select>
126-
<input class="custom_select__placeholder" type="text" value="" readonly="">
126+
<input class="custom_select__placeholder" type="text" value="" contenteditable="true">
127127
<ul class="custom_select__list js_widget_custom__list">
128-
<li class="custom_select__item" data-value="" ></li>
128+
<li class="custom_select__item" data-value="" >none</li>
129129
<li class="custom_select__item" data-value="AU">Australia</li>
130130
<li class="custom_select__item" data-value="CA">Canada</li>
131131
<li class="custom_select__item" data-value="GB">Great Britain</li>
@@ -139,16 +139,18 @@
139139
<label for="w-source">Source</label>
140140
<div class="js_custom_select custom_select">
141141
<select id="w-source" class="custom_select__field" name="w-source" tabindex="-1">
142-
<option value="" label=" "></option>
142+
<option value="" label=" ">none</option>
143143
<option value="ticketmaster">ticketmaster</option>
144+
<option value="ticketweb">ticketweb</option>
144145
<option value="tmr">ticketmaster resale platform</option>
145146
<option value="universe">universe</option>
146147
<option value="frontgate">frontgate</option>
147148
</select>
148-
<input class="custom_select__placeholder" type="text" value="" readonly="">
149+
<input class="custom_select__placeholder" type="text" value="" contenteditable="true">
149150
<ul class="custom_select__list js_widget_custom__list">
150-
<li class="custom_select__item" data-value="" ></li>
151+
<li class="custom_select__item" data-value="" >none</li>
151152
<li class="custom_select__item" data-value="ticketmaster">ticketmaster</li>
153+
<li class="custom_select__item" data-value="ticketweb">ticketweb</li>
152154
<li class="custom_select__item" data-value="tmr">tmr (ticketmaster resale platform)</li>
153155
<li class="custom_select__item" data-value="universe">universe</li>
154156
<li class="custom_select__item" data-value="frontgate">frontgate</li>

‎_includes/widget-countdown-config.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
API Key <span class="config_field__description">(Required)</span>
2323
</label>
2424
<a href="https://developer-acct.ticketmaster.com/user/login" class="pull-right">Get your own</a>
25-
<div class="widget_api_key__field">
25+
<div class="widget_api_key__field" id="js_custom_select_key">
2626
<input type="text" id="w-tm-api-key" name="w-tm-api-key" value="">
2727
<a href="/support/faq/" class="widget_api_key__question"></a>
2828
</div>

‎_layouts/api-explorer-v2.html‎

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@
55
<div id="spinner hide"></div>
66
{% include home-header.html %}
77

8+
<section class="modal fade map-popup" id="map-popup" role="dialog">
9+
<div class="vertical-alignment-helper">
10+
<div class="modal-dialog modal-lg vertical-align-center">
11+
<div class="modal-content">
12+
<div class="modal-header">
13+
<h4 class="modal-title">Location</h4>
14+
</div>
15+
<div class="modal-body">
16+
<div id="map" class="modal-body-wrapper"></div>
17+
</div>
18+
<div class="modal-footer">
19+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
20+
</div>
21+
</div>
22+
</div>
23+
</div>
24+
</section>
25+
826
<error-pop-up></error-pop-up>
927

1028
<div id="api-explorer-v2" class="api-explorer-v2">
@@ -48,8 +66,8 @@ <h1 class="api-exp-header__title">TICKETMASTER API EXPLORER V2.0</h1>
4866
<!--content-wrapper-->
4967
<section class="api-exp-main">
5068
<!--menu-->
51-
<category-menu params="data: base, selectedCategory:selectedCategory">
52-
<custom-select params="options: categories, onselect: selectCategory"></custom-select>
69+
<category-menu params="data: base, selectedCategory: selectedCategory">
70+
<custom-select params="options: categories, selected: selectedCategory, onselect: selectCategory"></custom-select>
5371
</category-menu>
5472

5573
<!--api key-->

‎_layouts/api-explorer.html‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
{% include classification-selector-modal.html %}
4848
<script src="{{'/scripts/vendors/jstree.min.js' | prepend: site.baseurl }}"></script>
4949
<script src="{{'/scripts/components/classification-selector.js' | prepend: site.baseurl }}"></script>
50+
<script src="{{'/scripts/components/application-selector.js' | prepend: site.baseurl }}"></script>
5051
<script>
5152
/**
5253
* add classification selector to api-explorer v1 (made by V.Menshutin)
@@ -91,6 +92,7 @@
9192

9293
checkUserKey();
9394

95+
9496
</script>
9597
<!--<script src="{{'/scripts/components/feedback.js' | prepend: site.baseurl }}"></script>-->
9698
</body>

0 commit comments

Comments
 (0)