diff --git a/intranet/modules/impression/static/impression.css b/intranet/modules/impression/static/impression.css index 09f330ea..8aeb909f 100644 --- a/intranet/modules/impression/static/impression.css +++ b/intranet/modules/impression/static/impression.css @@ -26,7 +26,7 @@ ul#actionMenu li { width:150px; text-align:center; padding:50px 5px 5px 5px; - background: url(../images/pdf-icon.png) center top no-repeat; + background: url(./pdf-icon.png) center top no-repeat; margin:0 0 10px 0; overflow:auto; } diff --git a/intranet/modules/impression/static/impression.js b/intranet/modules/impression/static/impression.js index 298ab375..ab872473 100644 --- a/intranet/modules/impression/static/impression.js +++ b/intranet/modules/impression/static/impression.js @@ -35,7 +35,7 @@ Impression.settings.images = [ Impression.settings.preloadImage = function(imageName) { var image = new Image(); - image.src = "/static/images/"+imageName; + image.src = "./static/"+imageName; } Impression.settings.preloadAllImages = function() { @@ -181,7 +181,7 @@ Impression.settings.updatePreview = function() image_name = "portrait_transparent_" + this.type_impression + ".png"; else image_name = "portrait_" + this.type_impression + '_' + this.agrafes + ".png"; - var image = createDOM("IMG",{'src':'/static/images/'+image_name}); + var image = createDOM("IMG",{'src':'./static/'+image_name}); log("Updating preview (new image : " + image_name + ")"); replaceChildNodes("preview",image) } @@ -196,7 +196,7 @@ Impression.popup.popupImpression = function(code) { Popup.hide(); Popup.create({}, "Impression en cours...", DIV( - {"id":"printingPopupContent", "style":"background-image:url(/static/images/dialog-printer.png)"}, + {"id":"printingPopupContent", "style":"background-image:url(./static/dialog-printer.png)"}, SPAN("code: "+code), A({"href":"https://wiki.crans.org/VieCrans/ImpressionReseau", "class":"aide", "target":"_blank"}, "Comment récupérer mon impression ? "), A({"href":"index", "class":"aide", "style":"text-align:right;"}, "Nouvelle impression") @@ -209,7 +209,7 @@ Popup.display(); Impression.popup.popupError = function(erreur) { Popup.hide(); Popup.create({}, "Erreur", - DIV({"id":"printingPopupContent", "style":"background-image:url(/static/images/dialog-warning.png)"}, + DIV({"id":"printingPopupContent", "style":"background-image:url(./static/dialog-warning.png)"}, SPAN(erreur), A({"href":"mailto:nounous@crans.org", "class":"crans_help aide"}, "Envoyer un rapport aux nounous"), Popup.closeLink({"class":"aide", "style":"text-align:right;"}, "Fermer"))); @@ -220,7 +220,7 @@ Impression.popup.popupSolde = function(code) { Popup.hide(); Popup.create({}, "Solde insuffisant", DIV( - {"id":"printingPopupContent", "style":"background-image:url(/static/images/dialog-solde.png)"}, + {"id":"printingPopupContent", "style":"background-image:url(./static/dialog-solde.png)"}, SPAN("pas assez de sous"), A({"href":"https://wiki.crans.org/CransPratique/SoldeImpression", "class":"aide", "target":"_blank"}, "Comment recharger mon compte ? "), Popup.closeLink({"class":"aide", "style":"text-align:right;"}, "Fermer"))); @@ -269,7 +269,7 @@ Impression.AJAX.modifPrix = function( text, wheel ) { if (wheel) { - var image = createDOM("IMG",{'src':'/static/images/indicator.gif'}); + var image = createDOM("IMG",{'src':'./static/indicator.gif'}); } else { diff --git a/intranet/modules/impression/static/popup.js b/intranet/modules/impression/static/popup.js new file mode 100644 index 00000000..be13efbb --- /dev/null +++ b/intranet/modules/impression/static/popup.js @@ -0,0 +1,35 @@ +Popup = {}; +Popup.popupNode = null; +Popup.visible = false; + +Popup.display = function() +{ + if (this.popupNode == null) { + logError("Popup not created, cannot be displayed"); + return false; + } + appendChildNodes("pageContent", this.popupNode); + this.visible = true; + // logDebug("popup visible"); +} + +Popup.create = function(options, title_popup, content) { + var inPopup = DIV({"id":"__popupInDivId", "style":"background:white;margin:2px 5px;"}, content); + var outPopup = DIV({"id":"__popupOutDivId","style":"background:#AE0F3E;z-index:500;float:left;padding:0;min-width:300px;position:fixed;top:30%;left:30%;right:30%;"}, H1({"style":"font-size:1em;margin:0;text-align:center;color:white;"}, IMG({"src":"/static/images/WindowTitleLogo.png","alt":"icon", "style":"margin:0 5px;"}), title_popup), inPopup ); + roundElement(outPopup); + logDebug("Popup \""+ title_popup +"\" created"); + this.popupNode = outPopup; +} + +Popup.hide = function() { + if (this.visible) { + removeElement(this.popupNode); + this.visible = false; + } + // logDebug("popup not visible"); +} +Popup.closeLink = function(options, text_link) { + options["href"] = "#"; + options["onclick"] = "Popup.hide()"; + return A(options, text_link); +} diff --git a/intranet/modules/quota/main.py b/intranet/modules/quota/main.py index 958308c3..9c0f2b6a 100755 --- a/intranet/modules/quota/main.py +++ b/intranet/modules/quota/main.py @@ -19,8 +19,8 @@ class main(ModuleBase): def _get_quota(self): - #return quotas = crans.utils.quota.getUserQuota(cherrypy.session['uid']) - return [{'%': 33.9, 'quota': 390.62, 'label': u'Dossier personnel', 'limite': 585.94, 'filesystem': '/home', 'usage': 420.32}, {'%': 0.1, 'quota': 100.00, 'label': u'Boite de r\xe9ception', 'limite': 150.00, 'filesystem': '/var/mail', 'usage': 0.06}] + return crans.utils.quota.getUserQuota(cherrypy.session['uid']) + #return [{'%': 33.9, 'quota': 390.62, 'label': u'Dossier personnel', 'limite': 585.94, 'filesystem': '/home', 'usage': 420.32}, {'%': 0.1, 'quota': 100.00, 'label': u'Boite de r\xe9ception', 'limite': 150.00, 'filesystem': '/var/mail', 'usage': 0.06}] ##########################