| FazBrowse GitHub Viewer | Trending | | Home |
| Tools: [Download Repo ZIP] [Original HTTPS Page] |
1 parent fb18ba9 commit c9745cb
25 files changed
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,6 @@ import conf.{AnyGoodCachedHealthCheck, NeverExpiresSingleHealthCheck} | |||
| 4 | 4 | import play.api.libs.ws.WSClient | |
| 5 | 5 | ||
| 6 | 6 | class HealthCheck(wsClient: WSClient) extends AnyGoodCachedHealthCheck( | |
| 7 | - NeverExpiresSingleHealthCheck("/commercial/soulmates/mixed.json"), | ||
| 8 | 7 | NeverExpiresSingleHealthCheck("/commercial/masterclasses.json"), | |
| 9 | 8 | NeverExpiresSingleHealthCheck("/commercial/travel/offers.json"), | |
| 10 | 9 | NeverExpiresSingleHealthCheck("/commercial/jobs.json"), | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -28,17 +28,6 @@ class SoulmatesController extends Controller with implicits.Requests { | |||
| 28 | 28 | } | |
| 29 | 29 | } | |
| 30 | 30 | ||
| 31 | - def renderSoulmates(groupName: String) = Action { implicit request => | ||
| 32 | - soulmatesSample(groupName).toList match { | ||
| 33 | - case Nil => Cached(componentNilMaxAge){ jsonFormat.nilResult } | ||
| 34 | - case soulmates => Cached(componentMaxAge) { | ||
| 35 | - val clickMacro = request.getParameter("clickMacro") | ||
| 36 | - val omnitureId = request.getParameter("omnitureId") | ||
| 37 | - jsonFormat.result(views.html.soulmates.soulmates(soulmates, omnitureId, clickMacro)) | ||
| 38 | - } | ||
| 39 | - } | ||
| 40 | - } | ||
| 41 | - | ||
| 42 | 31 | def getSoulmates() = Action { implicit request => | |
| 43 | 32 | specificId match { | |
| 44 | 33 | case Some(feed) => Cached(60.seconds) { JsonComponent(soulmatesSample(feed)) } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -79,7 +79,6 @@ | |||
| 79 | 79 | <option value="shop">Shop</option> | |
| 80 | 80 | <option value="money">Money</option> | |
| 81 | 81 | <option value="gardening">Gardening</option> | |
| 82 | - <option value="soulmates">Soulmates</option> | ||
| 83 | 82 | </select> | |
| 84 | 83 | </dd> | |
| 85 | 84 | </dl> | |
@@ -132,7 +131,7 @@ | |||
| 132 | 131 | }); | |
| 133 | 132 | ||
| 134 | 133 | var $palette = $('#dfp-palette'), | |
| 135 | - toneClasses = ['brand', 'subscriptions', 'membership', 'live', 'jobs', 'networks', 'books', 'masterclasses', 'travel', 'shop', 'money', 'gardening', 'soulmates'] | ||
| 134 | + toneClasses = ['brand', 'subscriptions', 'membership', 'live', 'jobs', 'networks', 'books', 'masterclasses', 'travel', 'shop', 'money', 'gardening'] | ||
| 136 | 135 | .map(function (tone) { | |
| 137 | 136 | return 'adverts--tone-' + tone; | |
| 138 | 137 | }); | |
@@ -427,98 +426,6 @@ <h2 class="test-page-head"> | |||
| 427 | 426 | }); | |
| 428 | 427 | </script> | |
| 429 | 428 | ||
| 430 | - <div class="fc-container__inner"> | ||
| 431 | - <h2 class="test-page-head"> | ||
| 432 | - <a href="https://www.google.com/dfp/59666047#delivery/CreateCreativeTemplate/creativeTemplateId=10030887"> | ||
| 433 | - Merchandising: commercial component (soulmates) + feed | ||
| 434 | - </a> | ||
| 435 | - </h2> | ||
| 436 | - <form class="js-soulmates-feed"> | ||
| 437 | - <label>Feed selection: | ||
| 438 | - <select> | ||
| 439 | - <option value="mixednew" selected>Standard New</option> | ||
| 440 | - <option value="brighton">Brighton</option> | ||
| 441 | - <option value="east">East of England</option> | ||
| 442 | - <option value="eastmidlands">East Midlands</option> | ||
| 443 | - <option value="mature">Mature</option> | ||
| 444 | - <option value="men">Men</option> | ||
| 445 | - <option value="northeast">Northeast</option> | ||
| 446 | - <option value="northwest">Northwest</option> | ||
| 447 | - <option value="northwestnew">Northwest New</option> | ||
| 448 | - <option value="scotland">Scotland</option> | ||
| 449 | - <option value="south">South</option> | ||
| 450 | - <option value="southwest">Southwest</option> | ||
| 451 | - <option value="wales">Wales</option> | ||
| 452 | - <option value="westmidlands">West Midlands</option> | ||
| 453 | - <option value="women">Women</option> | ||
| 454 | - <option value="yorkshire">Yorkshire</option> | ||
| 455 | - <option value="young">Young</option> | ||
| 456 | - </select> | ||
| 457 | - </label> | ||
| 458 | - </form> | ||
| 459 | - </div> | ||
| 460 | - <div class="fc-container fc-container--commercial"> | ||
| 461 | - <div class="js-merchandising-soulmates-feed ad-slot ad-slot--merchandising ad-slot--commercial-component"></div> | ||
| 462 | - </div> | ||
| 463 | - <script> | ||
| 464 | - loadCommercial(function () { | ||
| 465 | - require([ | ||
| 466 | - 'bean', | ||
| 467 | - 'qwery', | ||
| 468 | - 'common/utils/$', | ||
| 469 | - 'commercial/modules/creatives/commercial-component' | ||
| 470 | - ]) | ||
| 471 | - .then(function( | ||
| 472 | - bean, | ||
| 473 | - qwery, | ||
| 474 | - $, | ||
| 475 | - CommercialComponent | ||
| 476 | - ) { | ||
| 477 | - var $soulmatesFeed = $('.js-merchandising-soulmates-feed'); | ||
| 478 | - | ||
| 479 | - bean.on(qwery('.js-soulmates-feed select')[0], 'change', function (event) { | ||
| 480 | - var commercialComponent = new CommercialComponent($soulmatesFeed[0], { | ||
| 481 | - type: 'soulmatesGroup', | ||
| 482 | - omnitureId: '[%OmnitureID%]', | ||
| 483 | - clickMacro: '%%CLICK_URL_ESC%%', | ||
| 484 | - soulmatesFeedName: $(event.srcElement).val() | ||
| 485 | - }); | ||
| 486 | - commercialComponent.postLoadEvents.soulmatesGroup = function () { | ||
| 487 | - $soulmatesFeed.removeClass('lazyloaded'); | ||
| 488 | - }; | ||
| 489 | - | ||
| 490 | - commercialComponent.create(); | ||
| 491 | - }); | ||
| 492 | - bean.fire(qwery('.js-soulmates-feed select')[0], 'change'); | ||
| 493 | - }); | ||
| 494 | - }); | ||
| 495 | - </script> | ||
| 496 | - | ||
| 497 | - <div class="fc-container__inner"> | ||
| 498 | - <h2 class="test-page-head"> | ||
| 499 | - <a href="https://www.google.com/dfp/59666047#delivery/CreateCreativeTemplate/creativeTemplateId=10030887"> | ||
| 500 | - Merchandising: commercial component (soulmates) | ||
| 501 | - </a> | ||
| 502 | - </h2> | ||
| 503 | - </div> | ||
| 504 | - <div class="fc-container fc-container--commercial"> | ||
| 505 | - <div class="js-merchandising-soulmates ad-slot ad-slot--merchandising ad-slot--commercial-component"></div> | ||
| 506 | - </div> | ||
| 507 | - <script> | ||
| 508 | - loadCommercial(function () { | ||
| 509 | - require(['commercial/modules/creatives/commercial-component']) | ||
| 510 | - .then(function( | ||
| 511 | - CommercialComponent | ||
| 512 | - ) { | ||
| 513 | - new CommercialComponent(document.querySelector('.js-merchandising-soulmates'), { | ||
| 514 | - type: 'soulmates', | ||
| 515 | - omnitureId: '[%OmnitureID%]', | ||
| 516 | - clickMacro: '%%CLICK_URL_ESC%%' | ||
| 517 | - }).create(); | ||
| 518 | - }); | ||
| 519 | - }); | ||
| 520 | - </script> | ||
| 521 | - | ||
| 522 | 429 | <div class="fc-container__inner"> | |
| 523 | 430 | <h2 class="test-page-head"> | |
| 524 | 431 | <a href="https://www.google.com/dfp/59666047#delivery/CreateCreativeTemplate/creativeTemplateId=10022487">Merchandising: blended component</a> | |
@@ -533,7 +440,7 @@ <h2 class="test-page-head"> | |||
| 533 | 440 | ) { | |
| 534 | 441 | new CommercialComponent(document.querySelector('.dfp-ad--merchandising-multi'), { | |
| 535 | 442 | type: 'multi', | |
| 536 | - components: ['soulmates', 'jobs', 'books', 'masterclasses'], | ||
| 443 | + components: ['jobs', 'books', 'masterclasses'], | ||
| 537 | 444 | slotIds: ['','','',''], | |
| 538 | 445 | clickMacro: '%%CLICK_URL_ESC%%', | |
| 539 | 446 | omnitureId: '[%OmnitureID%]' | |
@@ -677,42 +584,6 @@ <h2 class="test-page-head"> | |||
| 677 | 584 | ("clickMacro", "%%CLICK_URL_ESC%%") | |
| 678 | 585 | )) | |
| 679 | 586 | ), | |
| 680 | - Map( | ||
| 681 | - ("id", "multiple2"), | ||
| 682 | - ("type", "multiple"), | ||
| 683 | - ("creativeId", "10025847"), | ||
| 684 | - ("args", Json.obj( | ||
| 685 | - ("creative", "manual-multiple"), | ||
| 686 | - ("base__url", "https://soulmates.theguardian.com"), | ||
| 687 | - ("offerlinktext", "Offer link text"), | ||
| 688 | - ("viewalltext", "View all text"), | ||
| 689 | - ("offeramount", "offer-amount"), | ||
| 690 | - ("relevance", "high"), | ||
| 691 | - ("Toneclass", "commercial--tone-soulmates"), | ||
| 692 | - ("offer1title", "Offer 1 Title"), | ||
| 693 | - ("offer1linktext", "Offer 1 Link Text"), | ||
| 694 | - ("offer1url", "http://www.theguardian.com/uk"), | ||
| 695 | - ("offer1meta", "Offer 1 Meta"), | ||
| 696 | - ("offer1image", "http://www.catgifpage.com/gifs/247.gif"), | ||
| 697 | - ("offer2title", "Offer 2 Title"), | ||
| 698 | - ("offer2linktext", "Offer 2 Link Text"), | ||
| 699 | - ("offer2url", "http://www.theguardian.com/uk"), | ||
| 700 | - ("offer2meta", "Offer 1 Meta"), | ||
| 701 | - ("offer2image", "http://www.catgifpage.com/gifs/247.gif"), | ||
| 702 | - ("offer3title", "Offer 3 Title"), | ||
| 703 | - ("offer3linktext", "Offer 3 Link Text"), | ||
| 704 | - ("offer3url", "http://www.theguardian.com/uk"), | ||
| 705 | - ("offer3meta", "Offer 1 Meta"), | ||
| 706 | - ("offer3image", "http://www.catgifpage.com/gifs/247.gif"), | ||
| 707 | - ("offer4title", "Offer 4 Title"), | ||
| 708 | - ("offer4linktext", "Offer 4 Link Text"), | ||
| 709 | - ("offer4url", "http://www.theguardian.com/uk"), | ||
| 710 | - ("offer4meta", "Offer 1 Meta"), | ||
| 711 | - ("offer4image", "http://www.catgifpage.com/gifs/247.gif"), | ||
| 712 | - ("omnitureId", "[%OmnitureID%]"), | ||
| 713 | - ("clickMacro", "%%CLICK_URL_ESC%%") | ||
| 714 | - )) | ||
| 715 | - ), | ||
| 716 | 587 | Map( | |
| 717 | 588 | ("id", "multipleMembership"), | |
| 718 | 589 | ("type", "multiple"), | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -19,7 +19,6 @@ GET /commercial/jobs/api/jobs.json comm | |||
| 19 | 19 | GET /commercial/masterclasses.json commercial.controllers.MasterclassesController.renderMasterclasses | |
| 20 | 20 | ||
| 21 | 21 | # Soulmates merchandising components | |
| 22 | - GET /commercial/soulmates/$subgroup<\w+>.json commercial.controllers.SoulmatesController.renderSoulmates(subgroup) | ||
| 23 | 22 | GET /commercial/api/soulmates.json commercial.controllers.SoulmatesController.getSoulmates | |
| 24 | 23 | ||
| 25 | 24 | # Book merchandising components | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -276,7 +276,6 @@ GET /commercial/travel/api/offers.json | |||
| 276 | 276 | GET /commercial/jobs.json commercial.controllers.JobsController.renderJobs | |
| 277 | 277 | GET /commercial/jobs/api/jobs.json commercial.controllers.JobsController.getJobs | |
| 278 | 278 | GET /commercial/masterclasses.json commercial.controllers.MasterclassesController.renderMasterclasses | |
| 279 | - GET /commercial/soulmates/$subgroup<\w+>.json commercial.controllers.SoulmatesController.renderSoulmates(subgroup) | ||
| 280 | 279 | GET /commercial/api/soulmates.json commercial.controllers.SoulmatesController.getSoulmates | |
| 281 | 280 | GET /commercial/books/book.json commercial.controllers.BookOffersController.renderBook | |
| 282 | 281 | GET /commercial/books/books.json commercial.controllers.BookOffersController.renderBooks | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -25,7 +25,6 @@ GET /crosswords/$crosswordType<cryptic|quick|quiptic|prize|everyman|azed| | |||
| 25 | 25 | GET /commercial/travel/offers.json commercial.controllers.TravelOffersController.renderTravel | |
| 26 | 26 | GET /commercial/jobs.json commercial.controllers.JobsController.renderJobs | |
| 27 | 27 | GET /commercial/masterclasses.json commercial.controllers.MasterclassesController.renderMasterclasses | |
| 28 | - GET /commercial/soulmates/$subgroup<\w+>.json commercial.controllers.SoulmatesController.renderSoulmates(subgroup) | ||
| 29 | 28 | GET /commercial/books/book.json commercial.controllers.BookOffersController.renderBook | |
| 30 | 29 | GET /commercial/books/books.json commercial.controllers.BookOffersController.renderBooks | |
| 31 | 30 | GET /advertiser-content/:campaignName/:pageName commercial.controllers.HostedContentController.renderHostedPage(campaignName, pageName) | |
| Back | FazBrowse Home | New Git URL |
0 commit comments