Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
switch-wayf
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
GIP RENATER
switch-wayf
Commits
3b821a0a
Commit
3b821a0a
authored
Mar 25, 2019
by
Geoffroy ARNOUD
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added $apiURL param
Changed when select2Functions.js is loaded #K69
parent
c62d57a1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
7 deletions
+8
-7
etc/config.dist.php
etc/config.dist.php
+2
-1
www/js/embeddedWAYF.js
www/js/embeddedWAYF.js
+6
-6
No files found.
etc/config.dist.php
View file @
3b821a0a
...
@@ -244,7 +244,8 @@
...
@@ -244,7 +244,8 @@
// the WAYF script.
// the WAYF script.
//$javascriptURL = 'https://ds.example.org/SWITCHwayf/js';
//$javascriptURL = 'https://ds.example.org/SWITCHwayf/js';
// Abolute URL to point to APIs
//$apiURL = 'https://ds.example.org/SWITCHwayf/api';
// 5. Appearance Settings
// 5. Appearance Settings
//**************************
//**************************
...
...
www/js/embeddedWAYF.js
View file @
3b821a0a
...
@@ -672,12 +672,6 @@
...
@@ -672,12 +672,6 @@
var
head
=
document
.
getElementsByTagName
(
'
head
'
)[
0
];
var
head
=
document
.
getElementsByTagName
(
'
head
'
)[
0
];
var
select2Loaded
=
false
;
var
select2Loaded
=
false
;
var
select2Functions
=
document
.
createElement
(
'
script
'
);
select2Functions
.
src
=
"
<?php echo $javascriptURL ?>/select2Functions.js
"
;
select2Functions
.
type
=
'
text/javascript
'
;
head
.
appendChild
(
select2Functions
);
var
script
=
document
.
createElement
(
'
script
'
);
var
script
=
document
.
createElement
(
'
script
'
);
script
.
src
=
'
<?php echo $javascriptURL ?>/jquery.js
'
;
script
.
src
=
'
<?php echo $javascriptURL ?>/jquery.js
'
;
script
.
type
=
'
text/javascript
'
;
script
.
type
=
'
text/javascript
'
;
...
@@ -710,6 +704,12 @@
...
@@ -710,6 +704,12 @@
// Load Select2 JS
// Load Select2 JS
var
head
=
document
.
getElementsByTagName
(
'
head
'
)[
0
];
var
head
=
document
.
getElementsByTagName
(
'
head
'
)[
0
];
var
select2Functions
=
document
.
createElement
(
'
script
'
);
select2Functions
.
src
=
"
<?php echo $javascriptURL ?>/select2Functions.js
"
;
select2Functions
.
type
=
'
text/javascript
'
;
head
.
appendChild
(
select2Functions
);
var
select2Script
=
document
.
createElement
(
'
script
'
);
var
select2Script
=
document
.
createElement
(
'
script
'
);
select2Script
.
src
=
"
<?php echo($javascriptURL .'/select2.min.js') ?>
"
;
select2Script
.
src
=
"
<?php echo($javascriptURL .'/select2.min.js') ?>
"
;
select2Script
.
type
=
'
text/javascript
'
;
select2Script
.
type
=
'
text/javascript
'
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment