From 2ce1e81bcf56b09dff35447a09fabbadc638e70c Mon Sep 17 00:00:00 2001 From: gdetrez Date: Thu, 16 Nov 2006 23:22:53 +0100 Subject: [PATCH] fonctions darcs-hash:20061116222253-f46e9-a5888d519a272a8a44ad4d584100a413a799e31e.gz --- intranet/static/scripts/impression.js | 11 ++++++++--- intranet/static/scripts/machines.js | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/intranet/static/scripts/impression.js b/intranet/static/scripts/impression.js index 23426a9b..d7cf541e 100644 --- a/intranet/static/scripts/impression.js +++ b/intranet/static/scripts/impression.js @@ -58,6 +58,7 @@ Impression.settings.reset = function () { log("Reset form"); this.theform.reset(); this.init(); + Impression.settings.update(); } Impression.settings.disableForm = function(bool) @@ -126,7 +127,7 @@ Impression.settings.disableField = function(afield) { // //// fieldChanges : when a field is changed // -Impression.settings.update = function (field) { +Impression.settings.update = function () { var orientation = "portrait"; if (this.theform.type_impression_couleur.checked) this.getValue(this.theform.type_impression_couleur); @@ -197,8 +198,12 @@ Impression.popup.popupImpression = function(code) { DIV( {"id":"printingPopupContent", "style":"background-image:url(/static/images/dialog-printer.png)"}, SPAN("code: "+code), - A({"href":"https://wiki.crans.org/VieCrans/ImpressionReseau", "class":"aide", "target":"_blank"}, "Comment récupérer mon impression ? "))); - Popup.display(); + 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") + ) + + ); +Popup.display(); } Impression.popup.popupError = function(erreur) { diff --git a/intranet/static/scripts/machines.js b/intranet/static/scripts/machines.js index c77906e4..ecc307e4 100644 --- a/intranet/static/scripts/machines.js +++ b/intranet/static/scripts/machines.js @@ -199,7 +199,7 @@ Machines.actions.disponibles = 'Demander l\'ouverture d\'un port':'Machines.actions.formulaire.ouverturePort(Machines.currentMid);' } Machines.actions.actionForMachineList = ['Ajouter machine fixe', 'Ajouter machine wifi']; -Machines.actions.actionsForInfoPane = ['Modifier Mac', 'Renommer', 'Supprimer', 'Demander l\'ouverture d\'un port']; +Machines.actions.actionsForInfoPane = ['Modifier Mac', 'Renommer', 'Supprimer']; Machines.actions.makeMenu = function(actionListe) {