From d13304e8cbc8ecdb83315f8118e4b4dc88d05912 Mon Sep 17 00:00:00 2001
From: Tim van Dijen <tvdijen@gmail.com>
Date: Sun, 12 Aug 2018 00:50:17 +0200
Subject: [PATCH] discopower: move assets to assets-dir
---
modules/discopower/templates/disco.tpl.php | 6 +++---
modules/discopower/templates/disco.twig | 6 +++---
modules/discopower/www/{style.css => assets/css/disco.css} | 0
modules/discopower/www/{ => assets}/js/jquery.livesearch.js | 0
modules/discopower/www/{ => assets}/js/quicksilver.js | 0
modules/discopower/www/{ => assets}/js/suggest.js | 0
6 files changed, 6 insertions(+), 6 deletions(-)
rename modules/discopower/www/{style.css => assets/css/disco.css} (100%)
rename modules/discopower/www/{ => assets}/js/jquery.livesearch.js (100%)
rename modules/discopower/www/{ => assets}/js/quicksilver.js (100%)
rename modules/discopower/www/{ => assets}/js/suggest.js (100%)
diff --git a/modules/discopower/templates/disco.tpl.php b/modules/discopower/templates/disco.tpl.php
index 1ae62cabd..035a1b990 100644
--- a/modules/discopower/templates/disco.tpl.php
+++ b/modules/discopower/templates/disco.tpl.php
@@ -3,10 +3,10 @@
$this->data['header'] = $this->t('selectidp');
$this->data['jquery'] = array('core' => TRUE, 'ui' => TRUE, 'css' => TRUE);
-$this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" href="' . SimpleSAML\Module::getModuleUrl('discopower/style.css') . '" />';
+$this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" href="' . SimpleSAML\Module::getModuleUrl('discopower/assets/css/style.css') . '" />';
-$this->data['post'] = '<script type="text/javascript" src="' . SimpleSAML\Module::getModuleUrl('discopower/js/jquery.livesearch.js') . '"></script>';
-$this->data['post'] .= '<script type="text/javascript" src="' . SimpleSAML\Module::getModuleUrl('discopower/js/quicksilver.js') . '"></script>';
+$this->data['post'] = '<script type="text/javascript" src="' . SimpleSAML\Module::getModuleUrl('discopower/assets/js/jquery.livesearch.js') . '"></script>';
+$this->data['post'] .= '<script type="text/javascript" src="' . SimpleSAML\Module::getModuleUrl('discopower/assets/js/quicksilver.js') . '"></script>';
diff --git a/modules/discopower/templates/disco.twig b/modules/discopower/templates/disco.twig
index 3645cdb16..3a65afff1 100644
--- a/modules/discopower/templates/disco.twig
+++ b/modules/discopower/templates/disco.twig
@@ -2,11 +2,11 @@
{% extends "base.twig" %}
{% block preload %}
- <link href="{{ baseurlpath }}style.css" rel="stylesheet" type="text/css" media="screen" />
+ <link href="{{ baseurlpath }}assets/css/style.css" rel="stylesheet" type="text/css" media="screen" />
{% endblock %}
{% block postload %}
- <script type="text/javascript" src="{{ baseurlpath }}js/jquery.livesearch.js"></script>
- <script type="text/javascript" src="{{ baseurlpath }}js/{{ score }}.js"></script>
+ <script type="text/javascript" src="{{ baseurlpath }}assets/js/jquery.livesearch.js"></script>
+ <script type="text/javascript" src="{{ baseurlpath }}assets/js/{{ score }}.js"></script>
{{ search|raw }}
{% endblock %}
diff --git a/modules/discopower/www/style.css b/modules/discopower/www/assets/css/disco.css
similarity index 100%
rename from modules/discopower/www/style.css
rename to modules/discopower/www/assets/css/disco.css
diff --git a/modules/discopower/www/js/jquery.livesearch.js b/modules/discopower/www/assets/js/jquery.livesearch.js
similarity index 100%
rename from modules/discopower/www/js/jquery.livesearch.js
rename to modules/discopower/www/assets/js/jquery.livesearch.js
diff --git a/modules/discopower/www/js/quicksilver.js b/modules/discopower/www/assets/js/quicksilver.js
similarity index 100%
rename from modules/discopower/www/js/quicksilver.js
rename to modules/discopower/www/assets/js/quicksilver.js
diff --git a/modules/discopower/www/js/suggest.js b/modules/discopower/www/assets/js/suggest.js
similarity index 100%
rename from modules/discopower/www/js/suggest.js
rename to modules/discopower/www/assets/js/suggest.js
--
GitLab