From 99c860711187882cd62ab3cd668b402cd8cadde8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Mon, 11 Apr 2011 08:57:02 +0000
Subject: [PATCH] Set version update on discojuice
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2807 44740490-163a-0410-bde0-09ae8108e29a
---
modules/discojuice/lib/EmbedHelper.php | 2 +-
modules/discojuice/templates/central.tpl.php | 2 +-
.../www/discojuice/css/discojuice.css | 39 ++++++++++---------
.../www/discojuice/discojuice.ui.js | 3 ++
4 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/modules/discojuice/lib/EmbedHelper.php b/modules/discojuice/lib/EmbedHelper.php
index 20fd63ab5..ad08a5c21 100644
--- a/modules/discojuice/lib/EmbedHelper.php
+++ b/modules/discojuice/lib/EmbedHelper.php
@@ -7,7 +7,7 @@ class sspmod_discojuice_EmbedHelper {
public static function head($includeJQuery = TRUE) {
- $version = '0.1-' . rand(1000, 9999);
+ $version = '0.1-2';
$config = SimpleSAML_Configuration::getInstance();
$djconfig = SimpleSAML_Configuration::getOptionalConfig('discojuiceembed.php');
diff --git a/modules/discojuice/templates/central.tpl.php b/modules/discojuice/templates/central.tpl.php
index ab1d28657..6228f2544 100644
--- a/modules/discojuice/templates/central.tpl.php
+++ b/modules/discojuice/templates/central.tpl.php
@@ -1,7 +1,7 @@
<?php
-$version = '0.1';
+$version = '0.1-2';
header('P3P:CP="IDC DSP COR ADM DEVi TAIi PSA PSD IVAi IVDi CONi HIS OUR IND CNT"');
diff --git a/modules/discojuice/www/discojuice/css/discojuice.css b/modules/discojuice/www/discojuice/css/discojuice.css
index 84b0b5398..5080307af 100644
--- a/modules/discojuice/www/discojuice/css/discojuice.css
+++ b/modules/discojuice/www/discojuice/css/discojuice.css
@@ -114,7 +114,8 @@ div.discojuice a.textlink:hover {
*/
div.discojuice .discojuice_listContent {
overflow: auto;
- max-height: 450px;
+/* max-height: 40%; */
+ max-height: 450px;
}
div.discojuice div.scroller {
padding: 1px 1px 10px 1px;
@@ -222,25 +223,25 @@ div.discojuice div.scroller a {
-moz-border-radius:4px;
-webkit-border-radius:4px;
-
+ background-color: #fafafa;
-background-image: -webkit-gradient(
- linear,
- left bottom,
- left top,
- color-stop(0.3, rgb(220,220,220)),
- color-stop(0.9, rgb(240,240,240))
-);
-background-image: -moz-linear-gradient(
- center bottom,
- rgb(220,220,220) 30%,
- rgb(240,240,240) 90%
-);
-background-image: -o-linear-gradient(
- bottom,
- rgb(220,220,220) 30%,
- rgb(240,240,240) 90%
-);
+ background-image: -webkit-gradient(
+ linear,
+ left bottom,
+ left top,
+ color-stop(0.3, rgb(220,220,220)),
+ color-stop(0.9, rgb(240,240,240))
+ );
+ background-image: -moz-linear-gradient(
+ center bottom,
+ rgb(220,220,220) 30%,
+ rgb(240,240,240) 90%
+ );
+ background-image: -o-linear-gradient(
+ bottom,
+ rgb(220,220,220) 30%,
+ rgb(240,240,240) 90%
+ );
/* Text */
color: #333;
diff --git a/modules/discojuice/www/discojuice/discojuice.ui.js b/modules/discojuice/www/discojuice/discojuice.ui.js
index f092a3c0d..7d9907691 100644
--- a/modules/discojuice/www/discojuice/discojuice.ui.js
+++ b/modules/discojuice/www/discojuice/discojuice.ui.js
@@ -98,6 +98,9 @@ DiscoJuice.UI = {
if (debugweight) {
textLink += '<div class="debug">';
+
+ textLink += '<input type="text" style="display: block; width: 80%" name="debug.entityID" value="' + item.entityID + '" />';
+
var w = 0;
if (item.weight) {
w += item.weight;
--
GitLab