diff --git a/modules/discojuice/config-templates/discojuicecentral.php b/modules/discojuice/config-templates/discojuicecentral.php
index b4233ba67a0361d47ff45c39f04ceec812c4fd4a..feb8793e40fd4e3ed05e5220b977395f92602bc7 100644
--- a/modules/discojuice/config-templates/discojuicecentral.php
+++ b/modules/discojuice/config-templates/discojuicecentral.php
@@ -1,15 +1,25 @@
<?php
/**
- * This is the configuration file for the Auth MemCookie example.
+ * This is a DiscoJuice configuration file.
+ *
+ * This configuration is used for the standalone DiscoJuice instance, that will become available at:
+ * /simplesaml/module.php/discojuice/central.php
+ *
+ * For details about the configuration option visit the DiscoJuice documentation:
+ * http://discojuice.simplesamlphp.org/docs
*/
$config = array(
+ // Which hostnames should be allowed to read user selections on entities chosen using DiscoJuice.
+ // You need to enable those hostnames that is configured to read data using the DiscoJuiceReadWrite protocol.
+ // http://discojuice.simplesamlphp.org/docs/1.0/discoreadwrite
'acl' => array(
- 'simplesamlphp.org', 'foodl.org',
+ 'simplesamlphp.org', 'example.org',
),
+ // DiscoJuice opitions for the central DiscoJuice page.
'discojuice.options' => array(
"title"=> 'Sign in to <strong>this service</strong>',
"subtitle"=> "Select your Provider",
@@ -22,7 +32,5 @@ $config = array(
"location"=> true,
"debug.weight" => false,
),
-
-
);
\ No newline at end of file
diff --git a/modules/discojuice/config-templates/discojuiceembed.php b/modules/discojuice/config-templates/discojuiceembed.php
index 44a281ca1087117028863d115c10f65b96965725..ae0c418a6579711397955ec9c65daf900ab3085b 100644
--- a/modules/discojuice/config-templates/discojuiceembed.php
+++ b/modules/discojuice/config-templates/discojuiceembed.php
@@ -1,7 +1,12 @@
<?php
/**
- * This is the configuration file for the Auth MemCookie example.
+ * This is a DiscoJuice configuration file.
+ *
+ * This configuration is used for the embedded DiscoJuice instance.
+ *
+ * For details about the configuration option visit the DiscoJuice documentation:
+ * http://discojuice.simplesamlphp.org/docs
*/
$config = array(
@@ -10,6 +15,21 @@ $config = array(
"title"=> 'Sign in to <strong>Foodle</strong>',
"subtitle"=> "Select your Provider",
+ // Want to override the inline help texts in DiscoJuice, uncomment the following section:
+
+ /*
+ 'textSearch' => 'søk etter noe...',
+ 'textHelp' => 'Finner du ikke en innnloggsingstjener du kjenner?',
+ 'textHelpMore' => 'Let mer...',
+ */
+
+ // Where to fetch metadata from. DiscoJuiceJSON format..
+ // You may provide a 'callback=?' querystring parameter in ordert to support JSONP.
+ // By default this feed endpoint is automatically configured to be correct for the
+ // DiscoJuice simpleSAMLphp module (which has a built-in feed generator).
+
+ // "metadata" => 'http://example.org/discojuicejson/index.php?callback=?',
+
"always"=> false,
"overlay"=> true,
"cookie"=> true,
@@ -23,23 +43,12 @@ $config = array(
function(e) {
- console.log(e);
-
+ // The auth parameter is indicating which authentication method is being used.
var auth = e.auth || null;
- var returnto = window.location.href || 'https://foodl.org';
- switch(auth) {
-
- case 'twitter':
- window.location = 'https://foodl.org/simplesaml/module.php/core/as_login.php?AuthId=twitter&ReturnTo=' + escape(returnto);
- break;
-
-
- case 'saml':
- default:
- window.location = 'https://foodl.org/simplesaml/module.php/core/as_login.php?AuthId=saml&ReturnTo=' + escape(returnto) + '&saml:idp=' + escape(e.entityID);
- break;
-
- }
+ var returnto = window.location.href || 'https://example.org';
+
+ window.location = 'https://foodl.org/simplesaml/module.php/core/as_login.php?AuthId=saml&ReturnTo=' + escape(returnto) + '&saml:idp=' + escape(e.entityID);
+
}
"
diff --git a/modules/discojuice/config-templates/discojuicefeed.php b/modules/discojuice/config-templates/discojuicefeed.php
index 3247be869c00784a12760d942e811261bf5b3222..bb05141a3eb8a9978a2e3a3ab5929b409cc0f7a8 100644
--- a/modules/discojuice/config-templates/discojuicefeed.php
+++ b/modules/discojuice/config-templates/discojuicefeed.php
@@ -1,350 +1,36 @@
<?php
/**
- * This is the configuration file for the Auth MemCookie example.
+ * This is a DiscoJuice configuration file.
+ *
+ * This configuration is used for the DiscoJuiceJSON metadata feed, that will become available at:
+ * /simplesaml/module.php/discojuice/feed.php
+ *
+ * For details about the configuration option visit the DiscoJuice documentation:
+ * http://discojuice.simplesamlphp.org/docs
*/
$config = array(
+ // Provides a list of IdPs that has already successfully logged in at least one user.
+ // Will give these IdPs extra weight in the UI.
+ // 'idplistapi' => 'https://foodl.org/api/idplist',
+
+ // Merge DiscoJuiceJSON with a additional sources.
+ // 'mergeEndpoints' => array(
+ // ),
+
+ // Include a set of extra entities, that is not present in metadata (DiscoJuiceJSON)
'insert' => array(
- 'https://twitter.com' => array(
- 'icon' => 'twitter.png',
- // 'descr' => 'Login with your Twitter account',
- 'title' => 'Twitter',
- 'weight' => -1,
- 'auth' => 'twitter',
- 'country' => '_all_',
- 'distance' => null,
- // 'keywords' => array(
- // 'Organizations' => array('Twitter'),
- // ),
- ),
),
-
+ // Exclude a set of entity IDs to not show in the Discovery Service
'exclude' => array(
- 'https://testidp.wayf.dk',
- 'https://betawayf.wayf.dk',
),
+ // Allows you to override DiscoJuiceJSON metadata.
+ // May be useful if an external party offers a DiscoJuiceJSON feed, and you would like to do some customization.
'overrides' => array(
- 'https://twitter.com' => array(
- 'icon' => 'twitter.png',
- 'weight' => -1,
- 'auth' => 'twitter',
- 'country' => '_all_',
- ),
- 'https://idp.feide.no' => array(
- 'icon' => 'feide2.png',
- 'descr' => 'Brukere i norske utdanningsinstitusjoner [beta]',
- 'weight' => -10,
- 'keywords' => array(
- 'Organizations' => array('UNINETT', 'Feide', 'UiO', 'NTNU', 'UiB', 'UiT'),
- 'Places' => array('Norway', 'Norge', 'Trondheim', 'Oslo', 'Bergen', 'Tromsø', 'Stavanger'),
- ),
- ),
- 'https://idp-test.feide.no' => array(
- 'icon' => 'feide2.png',
- 'weight' => 10,
- 'country' => 'XX',
- ),
- 'https://betawayf.wayf.dk' => array(
- 'icon' => 'wayf2.png',
- 'weight' => 10,
- 'country' => 'XX',
- ),
-
- 'https://www.rediris.es/sir/redirisidp' => array(
- 'icon' => 'rediris.png',
- 'weight' => -1,
- ),
- 'https://idp.nordu.net/idp/shibboleth' => array(
- 'icon' => 'nordunet.png',
- 'weight' => -3,
- ),
- 'https://openidp.feide.no' => array(
- 'icon' => 'openidp.png',
- 'title' => 'Feide OpenIdP',
- 'descr' => 'If you do not have an institutional account, register here.',
- 'country' => '_all_',
- 'weight' => -5,
- 'keywords' => array(
- 'Keyword' => array('Guest', 'OpenIdP', 'Orphanage', 'Homeless', 'Create Account', 'Register'),
- ),
- ),
- 'https://idp.protectnetwork.org/protectnetwork-idp' => array(
- 'icon' => 'protectnetwork.png',
- 'title' => 'Protect Network',
- 'descr' => 'If you do not have an institutional account, register here.',
- 'country' => '_all_',
- 'weight' => -6,
- 'geo' => null,
- 'keywords' => array(
- 'Keyword' => array('Guest', 'OpenIdP', 'Orphanage', 'Homeless', 'Create Account', 'Register'),
- ),
- ),
-
- 'https://login.terena.org/idp/saml2/idp/metadata.php' => array(
- 'icon' => 'terena2.png',
- 'descr' => 'Terena offices Netherlands',
- 'country' => 'NL',
- 'weight' => -3,
- ),
- 'https://idp.csc.fi/idp/shibboleth' => array(
- 'icon' => 'csc.png',
- 'weight' => -2,
- ),
- 'https://wayf.wayf.dk' => array(
- 'weight' => -3,
- 'icon' => 'wayf2.png',
- ),
-
- 'https://www.rediris.es/sir/umaidp' => array(
- 'weight' => -2,
- 'icon' => 'uma.png',
- ),
- 'https://idp.uma.es/simplesaml/saml2/idp/metadata.php' => array(
- 'weight' => -2,
- 'icon' => 'uma.png',
- ),
- 'https://idpguest.fccn.pt/idp/shibboleth' => array(
- 'weight' => -2,
- 'icon' => 'fccn.png',
- ),
- 'https://whoami.cesnet.cz/idp/shibboleth' => array(
- 'weight' => -2,
- 'icon' => 'cesnet.png',
- 'country' => 'CZ',
- ),
- 'https://login.ntua.gr/idp/shibboleth' => array(
- 'weight' => -2,
- 'icon' => 'ntua.png',
- 'country' => 'GR',
- ),
- 'https://idp.umu.se/saml2/idp/metadata.php' => array(
- 'title' => 'UmeĂĄ Universitet',
- 'weight' => -3,
- 'icon' => 'umeaa.png',
- # 'country' => 'sweden',
- ),
- 'SURFnet%20BV' => array(
- 'icon' => 'surfnet.png',
- 'weight' => -2
- ),
-
- 'gidp.geant.net' => array(
- 'country' => '_all_',
- 'icon' => 'geant.png',
- ),
- 'urn:mace:cru.fr:federation:sac' => array(
- 'icon' => 'cru.png',
- ),
- 'https://stc-test16.cis.brown.edu/idp/shibboleth' => array(
- 'icon' => 'brown.png',
- 'title' => 'Brown University',
- ),
-
-
-
-
-
-
-'https://www.rediris.es/sir/uvigoidp' => array(
- 'geo' => array('lat' => 42.169185 , 'lon' => -8.683609)
-),
-
-'https://www.rediris.es/sir/uahidp' => array(
- 'geo' => array('lat' => 40.510597 , 'lon' => -3.343858)
-),
-
-'https://www.rediris.es/sir/bcblidp' => array(
- 'geo' => array('lat' => 43.294269, 'lon' => -1.9861)
-),
-
-'https://www.rediris.es/sir/ullidp' => array(
- 'geo' => array('lat' => 28.4816, 'lon' => -16.3168)
-),
-
-'https://www.rediris.es/sir/ubuidp' => array(
- 'geo' => array('lat' => 42.340197, 'lon' => -3.7277)
-),
-
-'https://www.rediris.es/sir/upctidp' => array(
- 'geo' => array('lat' => 37.6018, 'lon' => -0.9794)
-),
-
-'https://www.rediris.es/sir/umidp' => array(
- 'geo' => array('lat' => 38.022, 'lon' => -1.174)
-),
-
-'https://www.rediris.es/sir/uclmidp' => array(
- 'geo' => array('lat' => 38.986096 , 'lon' => -3.927262)
-),
-
-'https://www.rediris.es/sir/upmidp' => array(
- 'geo' => array('lat' => 40.449, 'lon' => 3.7191)
-),
-
-'https://www.rediris.es/sir/boeidp' => array(
- 'geo' => array('lat' => 40.4867, 'lon' => -3.6604)
-),
-
-'https://www.rediris.es/sir/usidp' => array(
- 'geo' => array('lat' => 37.382, 'lon' => -5.99158)
-),
-
-'https://www.rediris.es/sir/usalidp'=> array(
- 'geo' => array('lat' => 40.790887, 'lon' => -5.539856)
- ),
-
-'https://www.rediris.es/sir/deustoidp' => array(
- 'geo' => array('lat' => 43.270891, 'lon' => -2.938769)
-),
-
-'https://www.rediris.es/sir/uaidp' => array(
- 'geo' => array('lat' => 38.385975, 'lon' => -0.514267)
-),
-
-'https://www.rediris.es/sir/ucoidp' => array(
- 'geo' => array('lat' => 37.9157009, 'lon' => -4.721796)
-),
-
-'https://www.rediris.es/sir/dipcidp' => array(
- 'geo' => array('lat' => 43.1819, 'lon' => -2.0039)
-),
-
-'https://www.rediris.es/sir/uaxidp' => array(
- 'geo' => array('lat' => 40.452, 'lon' => -3.984)
-),
-
-'https://www.rediris.es/sir/iacidp' => array(
- 'geo' => array('lat' => 28.47468, 'lon' => -16.308303)
-),
-
-'https://www.rediris.es/sir/redirisidp' => array(
- 'geo' => array('lat' => 40.447636, 'lon' => -3.694236)
-),
-
-'https://www.rediris.es/sir/ujaenidp' => array(
- 'geo' => array('lat' => 37.789800, 'lon' => -3.77795)
-),
-
-'https://www.rediris.es/sir/uabidp' => array(
- 'geo' => array('lat' => 41.500742, 'lon' => 2.110714)
-),
-
-'https://www.rediris.es/sir/uscidp' => array(
- 'geo' => array('lat' => 42.876, 'lon' => -8.554)
-),
-
-'https://www.rediris.es/sir/uhuidp' => array(
- 'geo' => array('lat' => 37.266847 , 'lon' => -6.921586)
-),
-
-'https://www.rediris.es/sir/iteidp' => array(
- 'geo' => array('lat' => 40.445684, 'lon' => -3.655001)
-),
-
-'https://www.rediris.es/sir/uniriojaidp' => array(
- 'geo' => array('lat' => 42.463, 'lon' => -2.427)
-),
-
-'https://www.rediris.es/sir/upcomillasidp' => array(
- 'geo' => array('lat' => 40.43000, 'lon' => -3.71127)
-),
-
-'https://www.rediris.es/sir/unedidp' => array(
- 'geo' => array('lat' => 40.4381, 'lon' => -3.7041)
-),
-
-'https://www.rediris.es/sir/udcidp' => array(
- 'geo' => array( 'lat' => 43.33127, 'lon' => -8.412184)
-),
-
-'https://www.rediris.es/sir/funepidp' => array(
- 'geo' => array('lat' => 40.4287, 'lon' => -3.7156)
-),
-
-'https://www.rediris.es/sir/cemfiidp' => array(
- 'geo' => array('lat' => 40.4140, 'lon' => -3.6896)
-),
-
-'https://www.rediris.es/sir/cesgaidp' => array(
- 'geo' => array('lat' => 42.875, 'lon' => -8.553)
-),
-
-'https://www.rediris.es/sir/upnaidp' => array(
- 'geo' => array('lat' => 42.8000, 'lon' => -1.6361)
-),
-
-'https://www.rediris.es/sir/ehuidp' => array(
- 'geo' => array('lat' => 43.331611, 'lon' => -2.971557)
-),
-
-'https://www.rediris.es/sir/unizaridp' => array(
- 'geo' => array('lat' => 41.643, 'lon' => -0.899)
-),
-
-'https://www.rediris.es/sir/unicanidp' => array(
- 'geo' => array('lat' => 43.471111, 'lon' => 3.805)
-),
-
-'https://www.rediris.es/sir/ufvidp' => array(
- 'geo' => array('lat' => 40.262, 'lon' => -3.500)
-),
-
-'https://www.rediris.es/sir/cicaidp' => array(
- 'geo' => array('lat' => 37.359058, 'lon' => -5.988909)
-),
-
-'https://www.rediris.es/sir/ciematidp' => array(
- 'geo' => array('lat' => 40.4553, 'lon' => -3.7246)
-),
-
-'https://www.rediris.es/sir/i2catidp' => array(
- 'geo' => array('lat' => 41.386984, 'lon' => 2.111435)
-),
-
-'https://www.rediris.es/sir/ivieidp' => array(
- 'geo' => array('lat' => 39.490507, 'lon' => -0.355907)
-),
-
-'https://www.rediris.es/sir/uamidp' => array(
- 'geo' => array('lat' => 40.547220, 'lon' => -3.692075)
-),
-
-'https://www.rediris.es/sir/uc3midp' => array(
- 'geo' => array('lat' => 40.332488, 'lon' => -3.765700)
-),
-
-'https://www.rediris.es/sir/umaidp' => array(
- 'geo' => array('lat' => 36.719645, 'lon' => -4.420018)
-),
-
-'https://www.rediris.es/sir/esaidp' => array (
- 'geo' => array('lat' => 40.445259, 'lon' => -3.953927)
-),
-
-'https://www.rediris.es/sir/ubidp' => array(
- 'geo' => array('lat' => 41.386843, 'lon' => 2.163652)
-),
-
-'https://www.rediris.es/sir/ucaidp' => array(
- 'geo' => array('lat' => 36.53388, 'lon' => -6.298031 )
-),
-
-'https://www.rediris.es/sir/unileonidp' => array(
- 'geo' => array('lat' => 42.612, 'lon' => -5.559)
-)
-
-
-
-
-
-
),
-
-
-
);
\ No newline at end of file
diff --git a/modules/discojuice/www/discojuice/logos/arcada.png b/modules/discojuice/www/discojuice/logos/arcada.png
deleted file mode 100644
index c59831bdcc4afa1d820d6c9036853676c31eb72e..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/arcada.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/bibsys.png b/modules/discojuice/www/discojuice/logos/bibsys.png
deleted file mode 100644
index eeb444867a929b87ab9ecbcd0ebb0330c66d0f47..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/bibsys.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/brown.png b/modules/discojuice/www/discojuice/logos/brown.png
deleted file mode 100644
index 4d02f894180b0135e0e560497c177ac5bc45a96c..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/brown.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/cesnet.png b/modules/discojuice/www/discojuice/logos/cesnet.png
deleted file mode 100644
index 64d8de82395a78089e9130d0de262786fb4e811e..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/cesnet.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/cru.png b/modules/discojuice/www/discojuice/logos/cru.png
deleted file mode 100644
index 0858997910277a6b8e11407abc533a65454f2b11..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/cru.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/csc.png b/modules/discojuice/www/discojuice/logos/csc.png
deleted file mode 100644
index 19890e427b5f337630fbd137da062fc4ce72a11b..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/csc.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/fccn.png b/modules/discojuice/www/discojuice/logos/fccn.png
deleted file mode 100644
index b38468421343701a84933d566398d859e4d48365..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/fccn.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/feide-s.png b/modules/discojuice/www/discojuice/logos/feide-s.png
deleted file mode 100644
index 07ef008eefd426b7356258a1ce084263ec818dd3..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/feide-s.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/feide.png b/modules/discojuice/www/discojuice/logos/feide.png
deleted file mode 100644
index 28eb56390146d5f37b722812e05f188fa6997a11..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/feide.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/feide2.png b/modules/discojuice/www/discojuice/logos/feide2.png
deleted file mode 100644
index 864eb5e5e0a63a4cc4d2b0b9ecfd36756dda68e3..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/feide2.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/geant.png b/modules/discojuice/www/discojuice/logos/geant.png
deleted file mode 100644
index 2c243bb3f8a8ffb623778928a3132df1ad104b71..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/geant.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/google.png b/modules/discojuice/www/discojuice/logos/google.png
deleted file mode 100644
index 6e2276c960e8dc17c5428f3ec19d4031c1a1956a..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/google.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/haka.png b/modules/discojuice/www/discojuice/logos/haka.png
deleted file mode 100644
index c51a23f76a5df5ea793be3ba7865f98f135b2458..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/haka.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/helsinki.png b/modules/discojuice/www/discojuice/logos/helsinki.png
deleted file mode 100644
index 71a0d35e10018ac73ba5a9a09cc1d86ca15f3f8a..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/helsinki.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/himolde.png b/modules/discojuice/www/discojuice/logos/himolde.png
deleted file mode 100644
index 8a0e1591317464aa8063f1055b2f6151cd2a7d35..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/himolde.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/hint.png b/modules/discojuice/www/discojuice/logos/hint.png
deleted file mode 100644
index 813bd0e75e27ddff3a0d26fddeb3671a3ac2fcd0..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/hint.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/hist.png b/modules/discojuice/www/discojuice/logos/hist.png
deleted file mode 100644
index 733852480ec2291347a87f98d4fe9b6f46f5c5e8..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/hist.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/iktsenter.png b/modules/discojuice/www/discojuice/logos/iktsenter.png
deleted file mode 100644
index 9049030992999ad4589271797ac15cd54d119b26..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/iktsenter.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/moreogromsdal.png b/modules/discojuice/www/discojuice/logos/moreogromsdal.png
deleted file mode 100644
index a726db6edc0bfb43a7cd541bddc96f07a43e3961..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/moreogromsdal.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/nordtrondelag.png b/modules/discojuice/www/discojuice/logos/nordtrondelag.png
deleted file mode 100644
index c23c1cd3f5493da778c5467440a22265cb4ac36c..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/nordtrondelag.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/nordunet.png b/modules/discojuice/www/discojuice/logos/nordunet.png
deleted file mode 100644
index 579c1480dca8f896cd596863e895d7846d19c087..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/nordunet.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/noreoguvdal.png b/modules/discojuice/www/discojuice/logos/noreoguvdal.png
deleted file mode 100644
index 45fd7039dc850188133b99529b3371c86bfc4e38..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/noreoguvdal.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/ntnu.png b/modules/discojuice/www/discojuice/logos/ntnu.png
deleted file mode 100644
index 0836fcc5430d799585e4922ea85404d8022c921b..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/ntnu.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/ntua.png b/modules/discojuice/www/discojuice/logos/ntua.png
deleted file mode 100644
index 64614018054f8068caf838d94914a42c20b437fb..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/ntua.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/openidp.png b/modules/discojuice/www/discojuice/logos/openidp.png
deleted file mode 100644
index 3f5868e07e22ac4852d6dd8801662fb014d92690..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/openidp.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/rediris.png b/modules/discojuice/www/discojuice/logos/rediris.png
deleted file mode 100644
index 3a1de0b8cfbf5d6f4dded95bdc7d7d00c42b8246..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/rediris.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/skole.png b/modules/discojuice/www/discojuice/logos/skole.png
deleted file mode 100644
index 4b479f58af6bf2493fc0b1293d61cbbf99d8cd5e..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/skole.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/sor-trondelag.png b/modules/discojuice/www/discojuice/logos/sor-trondelag.png
deleted file mode 100644
index ef70b8e6e3ec1dfd9e5121f9e61e2cef5974cc7e..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/sor-trondelag.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/surfnet.png b/modules/discojuice/www/discojuice/logos/surfnet.png
deleted file mode 100644
index 43862e23554ff33e0f7254a59f8a821efc21b5ac..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/surfnet.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/tampere.png b/modules/discojuice/www/discojuice/logos/tampere.png
deleted file mode 100644
index bb1ad09584b88a6622fd4de00d95569d070afed0..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/tampere.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/terena.png b/modules/discojuice/www/discojuice/logos/terena.png
deleted file mode 100644
index af69384f9d55eaa375d9fdec9ce3fcffc88192c0..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/terena.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/terena2.png b/modules/discojuice/www/discojuice/logos/terena2.png
deleted file mode 100644
index 22ee56fa5d80c89bdb65fb17d5a711813eb23565..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/terena2.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/trondheim-kommune.png b/modules/discojuice/www/discojuice/logos/trondheim-kommune.png
deleted file mode 100644
index ba72946e30fba4cf6093f566e8b307fd34a75650..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/trondheim-kommune.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/uin.png b/modules/discojuice/www/discojuice/logos/uin.png
deleted file mode 100644
index a72dda6c205cba1c213f37021b3e7daef7927b05..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/uin.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/uio.png b/modules/discojuice/www/discojuice/logos/uio.png
deleted file mode 100644
index 7b96a476a6203c13bdf228b6f62aa3e47c2d387b..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/uio.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/uma.png b/modules/discojuice/www/discojuice/logos/uma.png
deleted file mode 100644
index 6a639e4628bbb13e5e60f44e0f4f9ccc9a709566..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/uma.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/umeaa.png b/modules/discojuice/www/discojuice/logos/umeaa.png
deleted file mode 100644
index bdf3e6e07cc4ef0f0965cce57095be08a91f4119..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/umeaa.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/wayf.png b/modules/discojuice/www/discojuice/logos/wayf.png
deleted file mode 100644
index 51ed88ae6943626d1314a45af9ecee3d717e4a9e..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/wayf.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/wayf2.png b/modules/discojuice/www/discojuice/logos/wayf2.png
deleted file mode 100644
index ef5049e3267740aeb46f09426d950e922e2ab5fa..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/wayf2.png and /dev/null differ
diff --git a/modules/discojuice/www/discojuice/logos/yahoo.png b/modules/discojuice/www/discojuice/logos/yahoo.png
deleted file mode 100644
index 559afa241dca33a0162761cf6fa2d9bf441b6ab9..0000000000000000000000000000000000000000
Binary files a/modules/discojuice/www/discojuice/logos/yahoo.png and /dev/null differ