Skip to content

Commit 1003ad3

Browse files
jonasbardinojonasbardino
committed
Sync js site-conf auth selection onto migrid.org front page to effectively switch default over to UCPH OIDC sign up and log in. White-space only change to ERDA front page.
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6179 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent 18b4499 commit 1003ad3

File tree

2 files changed

+41
-27
lines changed

2 files changed

+41
-27
lines changed

‎state/wwwpublic/index-erda.dk-ucph-science.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ <h2 class="staticpage">Kom godt igang</h2>
565565
</ul>
566566
<p>
567567
Vi anbefaler kraftigt at læse og følge mindst den første intro-guide, hvis du
568-
vil benytte ERDA.
568+
vil benytte ERDA.
569569
</p>
570570
</div>
571571

‎state/wwwpublic/index-migrid.org.html

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
<link rel="icon" type="image/vnd.microsoft.icon"
3535
href="/images/skin/migrid-basic/favicon.ico"/>
3636

37+
<!-- site-specific variables used to adjust displayed information -->
38+
<script type="text/javascript" src="/images/site-conf.js"></script>
39+
3740
<script type="text/javascript" src="/images/js/jquery.js"></script>
3841
<script type="text/javascript" src="/images/js/jquery-ui.js"></script>
3942
<script type="text/javascript" src="/assets/js/V2/ui-dynamic.js"></script>
@@ -114,26 +117,37 @@
114117
switch_language(user_lang);
115118
$("#langselect").msDropdown().fadeIn(500);
116119

117-
var query = window.location.search;
118-
const urlParams = new URLSearchParams(query);
119-
var show = [];
120-
var quicktabs = ['extoid', 'extoidc', 'migoid', 'migcert'];
121-
urlParams.forEach((value, key) => {
122-
//console.log("Found "+value+" in "+key);
123-
show.push(value);
124-
});
125-
if (!urlParams.get('show')) {
126-
show = ['extoid', 'migoid', 'migcert'];
127-
}
128-
quicktabs.forEach((name) => {
129-
if (show.indexOf(name) >= 0) {
130-
//console.log("show "+name+" tab");
120+
var auth_methods = lookup_site_conf('auth_methods', ['extoid', 'migoid', 'extcert']);
121+
var query = window.location.search;
122+
const urlParams = new URLSearchParams(query);
123+
var show = [];
124+
var quicktabs = ['extoid', 'extoidc', 'migoid', 'migcert'];
125+
urlParams.forEach((value, key) => {
126+
//console.log("Found "+value+" in "+key);
127+
if (quicktabs.indexOf(value) >= 0) {
128+
show.push(value);
129+
}
130+
});
131+
if (!urlParams.get('show')) {
132+
if (auth_methods.length > 0) {
133+
//console.log("show auth_methods: " + auth_methods);
134+
show = auth_methods;
135+
} else {
136+
//console.log("show quicktabs: " + quicktabs);
137+
show = quicktabs;
138+
}
139+
} else {
140+
//console.log("show urlparams: " + show);
141+
}
142+
quicktabs.forEach((name) => {
143+
if (show.indexOf(name) >= 0) {
144+
//console.log("show "+name+" tab");
131145
$(".show-"+name).show();
132-
} else {
133-
//console.log("remove "+name+" tab");
146+
} else {
147+
//console.log("remove "+name+" tab");
134148
$(".show-"+name).remove();
135-
}
136-
});
149+
}
150+
});
137151

138152
/* Init Quick Start as tabs to avoid information overload and do
139153
last for proper init. */
@@ -204,10 +218,10 @@ <h1 class="staticpage">Welcome to MiGrid</h1>
204218

205219
<div id="quick-start-tabs-en">
206220
<ul class="fillwidth padspace">
207-
<li title="KU OpenID 2.0 Auth" class="show-extoid"><a href="#ucph-user-tab-en">KU / UCPH Users</a></li>
208-
<li title="KU OpenID Connect Auth" class="show-extoidc"><a href="#ucph-oidc-user-tab-en">KU / UCPH Users (NEW OIDC)</a></li>
209-
<li title="Built-in OpenID 2.0 Auth" class="show-migoid"><a href="#external-user-tab-en">External Users</a></li>
210-
<li title="X509 User Certificate Auth" class="show-extcert"><a href="#cert-user-tab-en">Advanced Access</a></li>
221+
<li title="KU OpenID 2.0 Auth" class="show-extoid"><a class="extoid-icon" href="#ucph-user-tab-en">KU / UCPH Users</a></li>
222+
<li title="KU OpenID Connect Auth" class="show-extoidc"><a class="extoidc-icon" href="#ucph-oidc-user-tab-en">KU / UCPH Users</a></li>
223+
<li title="Built-in OpenID 2.0 Auth" class="show-migoid"><a class="migoid-icon" href="#external-user-tab-en">External Users</a></li>
224+
<li title="X509 User Certificate Auth" class="show-extcert"><a class="extcert-icon" href="#cert-user-tab-en">Advanced Access</a></li>
211225
</ul>
212226

213227
<div id="ucph-user-tab-en" class="show-extoid">
@@ -408,10 +422,10 @@ <h1 class="staticpage">Velkommen til MiGrid!</h1>
408422
<div id="quick-start-tabs-da">
409423

410424
<ul>
411-
<li class="show-extoid" title="UCPH OpenID 2.0 Auth"><a href="#ucph-user-tab-da">KU / UCPH brugere</a></li>
412-
<li class="show-extoidc" title="UCPH OpenID Connect Auth"><a href="#ucph-oidc-user-tab-da">KU / UCPH brugere (NY OIDC)</a></li>
413-
<li class="show-migoid" title="Built-in OpenID 2.0 Auth"><a href="#external-user-tab-da">Eksterne brugere</a></li>
414-
<li class="show-extcert" title="X509 User Certificate Auth"><a href="#cert-user-tab-da">Avanceret adgang</a></li>
425+
<li title="UCPH OpenID 2.0 Auth" class="show-extoid"><a class="extoid-icon" href="#ucph-user-tab-da">KU / UCPH brugere</a></li>
426+
<li title="UCPH OpenID Connect Auth" class="show-extoidc"><a class="extoidc-icon" href="#ucph-oidc-user-tab-da">KU / UCPH brugere</a></li>
427+
<li title="Built-in OpenID 2.0 Auth" class="show-migoid"><a class="migoid-icon" href="#external-user-tab-da">Eksterne brugere</a></li>
428+
<li title="X509 User Certificate Auth" class="show-extcert"><a class="extcert-icon" href="#cert-user-tab-da">Avanceret adgang</a></li>
415429
</ul>
416430

417431
<div id="ucph-user-tab-da" class="show-extoid">

0 commit comments

Comments
 (0)