FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Remove the Oriel full integration switch and don't allow the analytics · devhttps/frontend@fa79d75 · GitHub

/ frontend Public
forked from guardian/frontend

Commit fa79d75

Browse files
janua
committed
Remove the Oriel full integration switch and don't allow the analytics
tag and the full integration tag to run at the same time
1 parent 86c2e95 commit fa79d75

10 files changed

Lines changed: 20 additions & 27 deletions

File tree

‎applications/app/pages/ContentHtmlPage.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import views.html.fragments._
1111
import views.html.fragments.commercial.pageSkin
1212
import views.html.fragments.page.body.{bodyTag, breakingNewsDiv, mainContent, skipToMainContent}
1313
import views.html.fragments.page.head.stylesheets.{criticalStyleInline, criticalStyleLink, styles}
14-
import views.html.fragments.page.head.{fixIEReferenceErrors, headTag, titleTag, weAreHiring, orielScriptTag}
14+
import views.html.fragments.page.head.{fixIEReferenceErrors, headTag, orielScriptTag, titleTag, weAreHiring}
1515
import views.html.fragments.page.{devTakeShot, htmlTag}
1616
import views.html.{newspaperContent, quizAnswerContent}
1717
import html.HtmlPageHelpers.ContentCSSFile
18-
import conf.switches.Switches.{ WeAreHiring, OrielFullIntegration }
18+
import conf.switches.Switches.WeAreHiring
1919

2020
object ContentHtmlPage extends HtmlPage[Page] {
2121

@@ -46,7 +46,7 @@ object ContentHtmlPage extends HtmlPage[Page] {
4646
htmlTag(
4747
headTag(
4848
weAreHiring() when WeAreHiring.isSwitchedOn,
49-
orielScriptTag() when OrielFullIntegration.isSwitchedOn,
49+
orielScriptTag(),
5050
titleTag(),
5151
metaData(),
5252
styles(allStyles),

‎applications/app/pages/GalleryHtmlPage.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package pages
22

33
import common.Edition
4-
import conf.switches.Switches.{OrielFullIntegration, WeAreHiring}
4+
import conf.switches.Switches.WeAreHiring
55
import html.{HtmlPage, Styles}
66
import html.HtmlPageHelpers._
77
import model.{ApplicationContext, GalleryPage, Page}
@@ -37,7 +37,7 @@ object GalleryHtmlPage extends HtmlPage[GalleryPage] {
3737
htmlTag(
3838
headTag(
3939
weAreHiring() when WeAreHiring.isSwitchedOn,
40-
orielScriptTag() when OrielFullIntegration.isSwitchedOn,
40+
orielScriptTag(),
4141
titleTag(),
4242
metaData(),
4343
styles(allStyles),

‎applications/app/pages/IndexHtmlPage.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package pages
22

33
import common.Edition
4-
import conf.switches.Switches.{OrielFullIntegration, WeAreHiring}
4+
import conf.switches.Switches.WeAreHiring
55
import html.HtmlPageHelpers._
66
import html.{HtmlPage, Styles}
77
import model.ApplicationContext
@@ -39,7 +39,7 @@ object IndexHtml {
3939
htmlTag(
4040
headTag(
4141
weAreHiring() when WeAreHiring.isSwitchedOn,
42-
orielScriptTag() when OrielFullIntegration.isSwitchedOn,
42+
orielScriptTag(),
4343
titleTag(),
4444
metaData(),
4545
headContent,

‎applications/app/pages/InteractiveHtmlPage.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package pages
22

33
import common.Edition
4-
import conf.switches.Switches.{OrielFullIntegration, WeAreHiring}
4+
import conf.switches.Switches.WeAreHiring
55
import controllers.InteractivePage
66
import html.{HtmlPage, Styles}
77
import html.HtmlPageHelpers._
@@ -46,7 +46,7 @@ object InteractiveHtmlPage extends HtmlPage[InteractivePage] {
4646
htmlTag(
4747
headTag(
4848
weAreHiring() when WeAreHiring.isSwitchedOn,
49-
orielScriptTag() when OrielFullIntegration.isSwitchedOn,
49+
orielScriptTag(),
5050
titleTag(),
5151
metaData(),
5252
styles(allStyles),

‎applications/app/pages/TagIndexHtmlPage.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package pages
22

33
import common.Edition
4-
import conf.switches.Switches.{OrielFullIntegration, WeAreHiring}
4+
import conf.switches.Switches.WeAreHiring
55
import html.HtmlPageHelpers._
66
import html.{HtmlPage, Styles}
77
import model.{ApplicationContext, ContributorsListing, PreferencesMetaData, StandalonePage, SubjectsListing, TagIndexPage}
@@ -43,7 +43,7 @@ object TagIndexHtmlPage extends HtmlPage[StandalonePage] {
4343
htmlTag(
4444
headTag(
4545
weAreHiring() when WeAreHiring.isSwitchedOn,
46-
orielScriptTag() when OrielFullIntegration.isSwitchedOn,
46+
orielScriptTag(),
4747
titleTag(),
4848
metaData(),
4949
styles(allStyles),

‎article/app/pages/StoryHtmlPage.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ object StoryHtmlPage {
4242
htmlTag(
4343
headTag(
4444
weAreHiring() when WeAreHiring.isSwitchedOn,
45-
orielScriptTag() when OrielFullIntegration.isSwitchedOn,
45+
orielScriptTag(),
4646
lotameScriptTag() when ActiveExperiments.isParticipating(LotameParticipation),
4747
titleTag(),
4848
metaData(),

‎common/app/conf/switches/CommercialSwitches.scala‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -317,16 +317,6 @@ trait CommercialSwitches {
317317
exposeClientSide = false
318318
)
319319

320-
val OrielFullIntegration: Switch = Switch(
321-
group = Commercial,
322-
name = "oriel-full-integration",
323-
description = "Include a tag dropped at the start of <head> for full Oriel integration",
324-
owners = group(Commercial),
325-
safeState = Off,
326-
sellByDate = new LocalDate(2018, 6, 28),
327-
exposeClientSide = false
328-
)
329-
330320
val BlockthroughSwitch: Switch = Switch(
331321
group = Commercial,
332322
name = "blockthrough",

‎common/app/views/fragments/commercial/orielAnalytics.scala.html‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,19 @@
22

33
@import conf.Configuration
44
@import experiments.{ ActiveExperiments, OrielParticipation }
5+
@import conf.switches.Switches.OrielAnalyticsSwitch
56

67
@if(
78
Configuration.environment.isProd &&
8-
ActiveExperiments.isParticipating(OrielParticipation)
9+
OrielAnalyticsSwitch.isSwitchedOn &&
10+
!ActiveExperiments.isParticipating(OrielParticipation)
911
) {
1012
<script async type="text/javascript" src="//f92j5.com/bilezg79cncj63usndtoa8igmvoritwjei5.js"></script>
1113
} else {
1214
@if(
1315
Configuration.environment.isCode &&
14-
ActiveExperiments.isParticipating(OrielParticipation)
16+
OrielAnalyticsSwitch.isSwitchedOn &&
17+
!ActiveExperiments.isParticipating(OrielParticipation)
1518
) {
1619
<script async type="text/javascript" src="//f92j5.com/ejihwhhs1nv430sy6u4d51elu49.js"></script>
1720
}

‎common/app/views/fragments/page/body/bodyTag.scala.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
@f
88
}
99

10-
@if(OrielAnalyticsSwitch.isSwitchedOn) {
10+
@if(OrielAnalyticsSwitch.isSwitchedOn && ) {
1111
@views.html.fragments.commercial.orielAnalytics()
1212
}
1313

‎facia/app/pages/FrontHtmlPage.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package pages
22

33
import common.Edition
4-
import conf.switches.Switches.{OrielFullIntegration, WeAreHiring}
4+
import conf.switches.Switches.WeAreHiring
55
import html.{HtmlPage, Styles}
66
import html.HtmlPageHelpers._
77
import model.{ApplicationContext, PressedPage}
@@ -45,7 +45,7 @@ object FrontHtmlPage extends HtmlPage[PressedPage] {
4545
htmlTag(
4646
headTag(
4747
weAreHiring() when WeAreHiring.isSwitchedOn,
48-
orielScriptTag() when OrielFullIntegration.isSwitchedOn,
48+
orielScriptTag(),
4949
titleTag(),
5050
metaData(),
5151
frontMeta(),

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL