From 65f7a8417357db2fb0400eb0f0f33c260d3cffa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=85kre=20Solberg?= <andreas.solberg@uninett.no>
Date: Tue, 27 Sep 2011 15:17:10 +0000
Subject: [PATCH] Adding info screen with icon
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@2931 44740490-163a-0410-bde0-09ae8108e29a
---
.../discojuice/www/discojuice/css/discojuice.css | 3 +++
.../discojuice/www/discojuice/discojuice.ui.js | 14 +++++++++++++-
modules/discojuice/www/discojuice/images/info.png | Bin 0 -> 467 bytes
3 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 modules/discojuice/www/discojuice/images/info.png
diff --git a/modules/discojuice/www/discojuice/css/discojuice.css b/modules/discojuice/www/discojuice/css/discojuice.css
index 06e940811..98a7e5d16 100644
--- a/modules/discojuice/www/discojuice/css/discojuice.css
+++ b/modules/discojuice/www/discojuice/css/discojuice.css
@@ -68,6 +68,9 @@ div.discojuice div.discojuice_page {
}
+div.discojuice p#dj_help {
+ cursor: pointer;
+}
diff --git a/modules/discojuice/www/discojuice/discojuice.ui.js b/modules/discojuice/www/discojuice/discojuice.ui.js
index 679b9a0c7..5d9818159 100644
--- a/modules/discojuice/www/discojuice/discojuice.ui.js
+++ b/modules/discojuice/www/discojuice/discojuice.ui.js
@@ -288,7 +288,10 @@ DiscoJuice.UI = {
'<div class="filters bottom">' +
// '<p style="margin 0px; color: #ccc; font-size: 75%; float: left">Settings</p>' +
- '<p style="margin 0px; text-align: right; color: #ccc; font-size: 75%">DiscoJuice © UNINETT</p>' +
+ '<p id="dj_help" style="margin 0px; text-align: right; color: #ccc; font-size: 75%">' +
+ 'DiscoJuice © UNINETT ' +
+ '<img class="" style="position: relative; bottom: -4px; right: -5px" alt="Information" src="' + imgpath + 'info.png" />'
+ '</p>' +
'</div>' +
@@ -315,6 +318,15 @@ DiscoJuice.UI = {
return false;
});
}
+
+ this.popup.find("p#dj_help").click(function() {
+ that.setScreen(
+ '<h2>About DiscoJuice</h2>' +
+ '<p style="margin: .5em 0px">DiscoJuice is a user interface to help users select which provider to login with. DiscoJuice is created by <a href="http://uninett.no">UNINETT</a></p>' +
+
+ '<p style="margin: .5em 10px"><a href="http://discojuice.org" target="_blank">Read more about DiscoJuice</a></p>' +
+ '<p style="margin: .5em 0px; font-size: 80%">Version: ' + DiscoJuice.Version);
+ });
this.popup.find("#discojuiceextesion_listener").click(function() {
that.control.discojuiceextension();
diff --git a/modules/discojuice/www/discojuice/images/info.png b/modules/discojuice/www/discojuice/images/info.png
new file mode 100644
index 0000000000000000000000000000000000000000..2417d58d02d5e617233178d4d4346c0dca6bfb90
GIT binary patch
literal 467
zcmV;^0WAKBP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004+Nkl<ZIE}TE
zO-lk%7=>LFW!qZ1D*G4y1HqjOcQ&MM1Vs>B=)(M9ltcv;zYqn#N2q>C%UVRs+J*f9
zqv<{acN)zof-W3*Iqx~=zH{fb+5Y3WT&`n}$8+ZOdJBLW?l)e$&*#g><MEeDrJ{Gc
zT?5o`^w4}~-VcRBSB*wPpG+qDa5!A`dc8EDhNFiD?H6}27%a5gZNogBPW5K9`6TFF
zKn+I^4caxc_)e#)s;`JfqmdyLruT3-tO05`dT7wP-R@H}AQFiL27`e<9*+%?M73JI
z1y&9X+GsR-ZU!Wi$&$Q5-qPuGo)d}0VJsFqqL$Oi2~(-mr5TXTW=mGVY&PTN??h`4
zP{Ua-$Ye5~0l8c*uo)mmzjrtsc0j!ufX56FqdLX^Udj+Tfef%tfCep|wLej-)$*FA
z8IOdxTrNKddIyO55hFb`Xt(Xbfk?hyEEYyUy<T4_ijwyG{TE_^-r(qoJ-9);brr=v
z*u{&h{eFKrpU=%zriP=3W~<qHipAndtJPA3xd5o)el-5&d;o|+c$xbK@2CI(002ov
JPDHLkV1l)9(k1`^
literal 0
HcmV?d00001
--
GitLab