From: psc Date: Tue, 23 Jun 2009 12:16:57 +0000 (+0000) Subject: Apply patch by mba for Trac #2667 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b93875530c287cebdd53efa51ece3c52398b3f63;p=gosa.git Apply patch by mba for Trac #2667 - Add download button for logon scripts - Change button label from "Import" to "Import script" git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13773 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/trunk/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po b/trunk/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po index da04eac74..6a5a6c065 100644 --- a/trunk/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po +++ b/trunk/gosa-plugins/goto/locale/de/LC_MESSAGES/messages.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: messages\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-22 14:24+0200\n" +"POT-Creation-Date: 2009-06-23 11:22+0200\n" "PO-Revision-Date: 2008-12-04 11:18+0100\n" "Last-Translator: Cajus Pollmeier \n" "Language-Team: deutsch \n" @@ -157,6 +157,10 @@ msgstr "Anlegen" msgid "Import" msgstr "Importieren" +#: personal/environment/logonManagement.tpl:65 +msgid "Import script" +msgstr "Skript importieren" + #: addons/goto/class_gotomasses.inc:380 msgid "Resume" msgstr "Fortsetzen" @@ -369,6 +373,7 @@ msgstr "Stelle einen Mechanismus bereit um Systemen automatisch zu aktivieren" #: admin/systems/goto/class_printGeneric.inc:966 #: admin/systems/goto/workstation.tpl:19 admin/systems/goto/printer.tpl:16 #: admin/systems/goto/terminal.tpl:19 +#: personal/environment/class_logonManagementDialog.inc:125 msgid "Description" msgstr "Beschreibung" @@ -1280,6 +1285,7 @@ msgstr "Einstellungen für Anmelde-Skripte" #: personal/environment/logonManagement.tpl:10 #: personal/environment/class_logonManagementDialog.inc:107 +#: personal/environment/class_logonManagementDialog.inc:121 msgid "Script name" msgstr "Skriptname" @@ -1436,6 +1442,7 @@ msgstr "Standard umschalten" #: admin/systems/goto/class_printGeneric.inc:720 #: admin/systems/goto/class_printGeneric.inc:964 #: admin/groups/apps/edit_entry.tpl:43 +#: personal/environment/class_logonManagementDialog.inc:117 msgid "Name" msgstr "Name" @@ -1588,6 +1595,7 @@ msgid "Place entry in members launch bar" msgstr "Platziere einen Eintrag in der Kontrollleiste der Gruppenmitglieder" #: admin/applications/generic.tpl:144 +#: personal/environment/class_logonManagementDialog.inc:57 msgid "Download" msgstr "Herunterladen" diff --git a/trunk/gosa-plugins/goto/locale/messages.po b/trunk/gosa-plugins/goto/locale/messages.po index be40fb55a..3e0928720 100644 --- a/trunk/gosa-plugins/goto/locale/messages.po +++ b/trunk/gosa-plugins/goto/locale/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-22 14:24+0200\n" +"POT-Creation-Date: 2009-06-23 11:22+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -147,6 +147,10 @@ msgstr "" msgid "Import" msgstr "" +#: personal/environment/logonManagement.tpl:65 +msgid "Import script" +msgstr "" + #: addons/goto/class_gotomasses.inc:380 msgid "Resume" msgstr "" @@ -358,6 +362,7 @@ msgstr "" #: admin/systems/goto/class_printGeneric.inc:966 #: admin/systems/goto/workstation.tpl:19 admin/systems/goto/printer.tpl:16 #: admin/systems/goto/terminal.tpl:19 +#: personal/environment/class_logonManagementDialog.inc:125 msgid "Description" msgstr "" @@ -1251,6 +1256,7 @@ msgstr "" #: personal/environment/logonManagement.tpl:10 #: personal/environment/class_logonManagementDialog.inc:107 +#: personal/environment/class_logonManagementDialog.inc:121 msgid "Script name" msgstr "" @@ -1405,6 +1411,7 @@ msgstr "" #: admin/systems/goto/class_printGeneric.inc:720 #: admin/systems/goto/class_printGeneric.inc:964 #: admin/groups/apps/edit_entry.tpl:43 +#: personal/environment/class_logonManagementDialog.inc:117 msgid "Name" msgstr "" @@ -1557,6 +1564,7 @@ msgid "Place entry in members launch bar" msgstr "" #: admin/applications/generic.tpl:144 +#: personal/environment/class_logonManagementDialog.inc:57 msgid "Download" msgstr "" diff --git a/trunk/gosa-plugins/goto/personal/environment/class_logonManagementDialog.inc b/trunk/gosa-plugins/goto/personal/environment/class_logonManagementDialog.inc index cd9522785..653324eb7 100644 --- a/trunk/gosa-plugins/goto/personal/environment/class_logonManagementDialog.inc +++ b/trunk/gosa-plugins/goto/personal/environment/class_logonManagementDialog.inc @@ -47,6 +47,19 @@ class logonManagementDialog extends plugin @unlink($_FILES['importFile']['tmp_name']); } + if(isset($_GET['getLogonData'])){ + send_binary_content($this->LogonData, $this->real_LogonName); + } + + /* Create download button*/ + if($this->dn != "new" && $this->LogonData != ""){ + $smarty->assign("DownMe"," + "._("Download")." + "); + }else{ + $smarty->assign("DownMe",""); + } + foreach($this->attributes as $attr){ $smarty->assign($attr,$this->$attr); if($this->$attr){ diff --git a/trunk/gosa-plugins/goto/personal/environment/logonManagement.tpl b/trunk/gosa-plugins/goto/personal/environment/logonManagement.tpl index 937f71f9d..73d36e84a 100644 --- a/trunk/gosa-plugins/goto/personal/environment/logonManagement.tpl +++ b/trunk/gosa-plugins/goto/personal/environment/logonManagement.tpl @@ -62,7 +62,8 @@ - + + {$DownMe}