Merge pull request #1063 from dnmvisser/discopower_fixes

Discopower fixes

modules/discopower/templates/disco.tpl.php

@@ -6,9 +6,9 @@ $this->data['jquery'] = ['core' => true, 'ui' => true, 'css' => true];
 $this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" href="'.
     SimpleSAML\Module::getModuleURL('discopower/assets/css/disco.css').'" />';
 
-$this->data['post'] = '<script type="text/javascript" src="'.
+$this->data['head'] .= '<script type="text/javascript" src="'.
     SimpleSAML\Module::getModuleURL('discopower/assets/js/jquery.livesearch.js').'"></script>';
-$this->data['post'] .= '<script type="text/javascript" src="'.
+$this->data['head'] .= '<script type="text/javascript" src="'.
     SimpleSAML\Module::getModuleURL('discopower/assets/js/quicksilver.js').'"></script>';
 
 if (!empty($this->data['faventry'])) {
@@ -143,6 +143,6 @@ foreach ($this->data['idplist'] as $tab => $slist) {
 </script>
 
 <?php
-$this->data['post'] .= '<script type="text/javascript" src="'.
+$this->data['head'] .= '<script type="text/javascript" src="'.
     SimpleSAML\Module::getModuleURL('discopower/assets/js/suggest.js').'"></script>';
 $this->includeAtTemplateBase('includes/footer.php');

modules/discopower/www/assets/css/disco.css

@@ -7,7 +7,7 @@
     color: #aaa;
 }
 .inlinesearch input {
-    background-image:url('../../resources/icons/silk/magnifier.png');
+    background-image:url('../../../../resources/icons/silk/magnifier.png');
     background-repeat:no-repeat;
     background-position:center left;
     border: 1px solid #ccc;
@@ -33,14 +33,14 @@ a.metaentry {
     cursor: hand;
 }
 a.metaentry.favourite {
-    background-image:url('../../resources/icons/silk/heart.png');
+    background-image:url('../../../../resources/icons/silk/heart.png');
     background-repeat:no-repeat;
     background-position:center left;
 }
 a.metaentry:hover {
     border: 1px solid #ccc;
     background: #eee;
-    background-image:url('../../resources/icons/silk/star.png');
+    background-image:url('../../../../resources/icons/silk/star.png');
     background-repeat:no-repeat;
     background-position:center left;
 }