Skip to content
This repository was archived by the owner on Apr 13, 2023. It is now read-only.

Commit d9e0a69

Browse files
authored
Merge pull request #29 from SpringRoll/feature/removing-http-urls
removed hard coded http urls
2 parents b933fd3 + 2b2497c commit d9e0a69

File tree

5 files changed

+719
-636
lines changed

5 files changed

+719
-636
lines changed

app/views/archive/game.jade

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -90,44 +90,44 @@ append gameContent
9090
.col-sm-2: strong Production
9191
.col-sm-10
9292
.input-group
93-
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="http://#{host}/embed/#{game.slug}" frameborder="0" />')
93+
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="//#{host}/embed/#{game.slug}" frameborder="0" />')
9494
.input-group-btn
95-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?controls=1&title=1")
95+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?controls=1&title=1")
9696
span.glyphicon.glyphicon-play
97-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?debug=1&controls=1&title=1")
97+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?debug=1&controls=1&title=1")
9898
span.glyphicon.glyphicon-wrench
9999
span.glyphicon.glyphicon-play
100100
.row.deployment
101101
.col-sm-2: strong Staging
102102
.col-sm-10
103103
.input-group
104-
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="http://#{host}/embed/#{game.slug}?status=stage&token=#{token}" frameborder="0" />')
104+
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="//#{host}/embed/#{game.slug}?status=stage&token=#{token}" frameborder="0" />')
105105
.input-group-btn
106-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=stage&controls=1&title=1&token=#{token}")
106+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=stage&controls=1&title=1&token=#{token}")
107107
span.glyphicon.glyphicon-play
108-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=stage&debug=1&controls=1&title=1&token=#{token}")
108+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=stage&debug=1&controls=1&title=1&token=#{token}")
109109
span.glyphicon.glyphicon-wrench
110110
span.glyphicon.glyphicon-play
111111
.row.deployment
112112
.col-sm-2: strong QA
113113
.col-sm-10
114114
.input-group
115-
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="http://#{host}/embed/#{game.slug}?status=qa&token=#{token}" frameborder="0" />')
115+
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="//#{host}/embed/#{game.slug}?status=qa&token=#{token}" frameborder="0" />')
116116
.input-group-btn
117-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=qa&controls=1&title=1&token=#{token}")
117+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=qa&controls=1&title=1&token=#{token}")
118118
span.glyphicon.glyphicon-play
119-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=qa&debug=1&controls=1&title=1&token=#{token}")
119+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=qa&debug=1&controls=1&title=1&token=#{token}")
120120
span.glyphicon.glyphicon-wrench
121121
span.glyphicon.glyphicon-play
122122

123123
.row.deployment
124124
.col-sm-2: strong Development
125125
.col-sm-10
126126
.input-group
127-
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="http://#{host}/embed/#{game.slug}?status=dev&token=#{token}" frameborder="0" />')
127+
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="//#{host}/embed/#{game.slug}?status=dev&token=#{token}" frameborder="0" />')
128128
.input-group-btn
129-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=dev&controls=1&title=1&token=#{token}")
129+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=dev&controls=1&title=1&token=#{token}")
130130
span.glyphicon.glyphicon-play
131-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=dev&debug=1&controls=1&title=1&token=#{token}")
131+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=dev&debug=1&controls=1&title=1&token=#{token}")
132132
span.glyphicon.glyphicon-wrench
133133
span.glyphicon.glyphicon-play

app/views/archive/releases.jade

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,15 @@ append gameContent
5454
.release-title.clearfix
5555
.btn-group.btn-flex-2
5656
if release.version
57-
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Release" href="http://#{host}/embed/#{game.slug}?version=#{release.version}&controls=1&title=1&token=#{token}")
57+
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Release" href="//#{host}/embed/#{game.slug}?version=#{release.version}&controls=1&title=1&token=#{token}")
5858
span.glyphicon.glyphicon-play
59-
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="http://#{host}/embed/#{game.slug}?version=#{release.version}&debug=1&controls=1&title=1&token=#{token}")
59+
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="//#{host}/embed/#{game.slug}?version=#{release.version}&debug=1&controls=1&title=1&token=#{token}")
6060
span.glyphicon.glyphicon-wrench
6161
span.glyphicon.glyphicon-play
6262
else
63-
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Release" href="http://#{host}/embed/#{game.slug}?commitId=#{release.commitId}&controls=1&title=1&token=#{token}")
63+
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Release" href="//#{host}/embed/#{game.slug}?commitId=#{release.commitId}&controls=1&title=1&token=#{token}")
6464
span.glyphicon.glyphicon-play
65-
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="http://#{host}/embed/#{game.slug}?commitId=#{release.commitId}&debug=1&controls=1&title=1&token=#{token}")
65+
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="//#{host}/embed/#{game.slug}?commitId=#{release.commitId}&debug=1&controls=1&title=1&token=#{token}")
6666
span.glyphicon.glyphicon-wrench
6767
span.glyphicon.glyphicon-play
6868
.col-sm-9: .row: .col-sm-12

app/views/games/game.jade

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,44 +93,44 @@ append gameContent
9393
.col-sm-2: strong Production
9494
.col-sm-10
9595
.input-group
96-
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="http://#{host}/embed/#{game.slug}" frameborder="0" />')
96+
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="//#{host}/embed/#{game.slug}" frameborder="0" />')
9797
.input-group-btn
98-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?controls=1&title=1")
98+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?controls=1&title=1")
9999
span.glyphicon.glyphicon-play
100-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?debug=1&controls=1&title=1")
100+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?debug=1&controls=1&title=1")
101101
span.glyphicon.glyphicon-wrench
102102
span.glyphicon.glyphicon-play
103103
.row.deployment
104104
.col-sm-2: strong Staging
105105
.col-sm-10
106106
.input-group
107-
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="http://#{host}/embed/#{game.slug}?status=stage&token=#{token}" frameborder="0" />')
107+
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="//#{host}/embed/#{game.slug}?status=stage&token=#{token}" frameborder="0" />')
108108
.input-group-btn
109-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=stage&controls=1&title=1&token=#{token}")
109+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=stage&controls=1&title=1&token=#{token}")
110110
span.glyphicon.glyphicon-play
111-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=stage&debug=1&controls=1&title=1&token=#{token}")
111+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=stage&debug=1&controls=1&title=1&token=#{token}")
112112
span.glyphicon.glyphicon-wrench
113113
span.glyphicon.glyphicon-play
114114
.row.deployment
115115
.col-sm-2: strong QA
116116
.col-sm-10
117117
.input-group
118-
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="http://#{host}/embed/#{game.slug}?status=qa&token=#{token}" frameborder="0" />')
118+
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="//#{host}/embed/#{game.slug}?status=qa&token=#{token}" frameborder="0" />')
119119
.input-group-btn
120-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=qa&controls=1&title=1&token=#{token}")
120+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=qa&controls=1&title=1&token=#{token}")
121121
span.glyphicon.glyphicon-play
122-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=qa&debug=1&controls=1&title=1&token=#{token}")
122+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=qa&debug=1&controls=1&title=1&token=#{token}")
123123
span.glyphicon.glyphicon-wrench
124124
span.glyphicon.glyphicon-play
125125

126126
.row.deployment
127127
.col-sm-2: strong Development
128128
.col-sm-10
129129
.input-group
130-
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="http://#{host}/embed/#{game.slug}?status=dev&token=#{token}" frameborder="0" />')
130+
input.monospace.form-control.select-all(readonly type="text" value='<iframe src="//#{host}/embed/#{game.slug}?status=dev&token=#{token}" frameborder="0" />')
131131
.input-group-btn
132-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=dev&controls=1&title=1&token=#{token}")
132+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=dev&controls=1&title=1&token=#{token}")
133133
span.glyphicon.glyphicon-play
134-
a.btn.btn-default(href="http://#{host}/embed/#{game.slug}?status=dev&debug=1&controls=1&title=1&token=#{token}")
134+
a.btn.btn-default(href="//#{host}/embed/#{game.slug}?status=dev&debug=1&controls=1&title=1&token=#{token}")
135135
span.glyphicon.glyphicon-wrench
136136
span.glyphicon.glyphicon-play

app/views/games/releases.jade

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ append gameContent
55
.panel-heading
66
if isEditor
77
include modal-release
8-
button.pull-right.btn.btn-sm.btn-default(data-toggle="modal" data-target="#addRelease")
9-
span.glyphicon.glyphicon-plus
8+
button.pull-right.btn.btn-sm.btn-default(data-toggle="modal" data-target="#addRelease")
9+
span.glyphicon.glyphicon-plus
1010
| Add
1111
h3.panel-title Releases
1212
if !game.releases.length
@@ -27,7 +27,7 @@ append gameContent
2727
button.btn.btn-default.btn-block.status.dropdown-toggle(data-toggle="dropdown")
2828
span.bullet
2929
span.name=release.status.toUpperCase()
30-
|
30+
|
3131
span.caret
3232
ul.dropdown-menu.statusChange-menu
3333
li(class=(release.status == "dev" ? "active" : ""))
@@ -55,34 +55,34 @@ append gameContent
5555
.release-title.clearfix
5656
.btn-group.btn-flex-2
5757
if release.version
58-
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Release" href="http://#{host}/embed/#{game.slug}?version=#{release.version}&controls=1&title=1&token=#{token}")
58+
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Release" href="//#{host}/embed/#{game.slug}?version=#{release.version}&controls=1&title=1&token=#{token}")
5959
span.glyphicon.glyphicon-play
60-
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="http://#{host}/embed/#{game.slug}?version=#{release.version}&debug=1&controls=1&title=1&token=#{token}")
60+
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="//#{host}/embed/#{game.slug}?version=#{release.version}&debug=1&controls=1&title=1&token=#{token}")
6161
span.glyphicon.glyphicon-wrench
62-
|
62+
|
6363
span.glyphicon.glyphicon-play
6464
else
65-
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Release" href="http://#{host}/embed/#{game.slug}?commitId=#{release.commitId}&controls=1&title=1&token=#{token}")
65+
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Release" href="//#{host}/embed/#{game.slug}?commitId=#{release.commitId}&controls=1&title=1&token=#{token}")
6666
span.glyphicon.glyphicon-play
67-
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="http://#{host}/embed/#{game.slug}?commitId=#{release.commitId}&debug=1&controls=1&title=1&token=#{token}")
68-
span.glyphicon.glyphicon-wrench
69-
|
67+
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="//#{host}/embed/#{game.slug}?commitId=#{release.commitId}&debug=1&controls=1&title=1&token=#{token}")
68+
span.glyphicon.glyphicon-wrench
69+
|
7070
span.glyphicon.glyphicon-play
7171
.col-sm-9: .row: .col-sm-12
7272
if release.version
7373
include releases-controls
74-
h4: strong Version #{release.version}
74+
h4: strong Version #{release.version}
7575
small: a.commit(href="#{game.repository}/commits/#{release.commitId}" data-toggle="tooltip" title="View Commit")=release.commitId.substr(0,7)
7676
else
7777
include releases-controls
78-
h4.release-data: strong Commit
78+
h4.release-data: strong Commit
7979
a(href="#{game.repository}/commits/#{release.commitId}" data-toggle="tooltip" title="View Commit")=release.commitId.substr(0,7)
8080

81-
h4.release-data: strong Branch
81+
h4.release-data: strong Branch
8282
a(href="#{game.repository}/browse?at=refs/heads/#{release.branch.replace('origin/', '')}" data-toggle="tooltip" title="View Branch")=release.branch
83-
83+
8484
.help-block.updated
85-
span Updated
85+
span Updated
8686
span=moment(release.updated).fromNow()
8787
if release.updatedBy
8888
| by #{release.updatedBy.name}

0 commit comments

Comments
 (0)