Fixed template loading

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10977 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/goto/addons/goto/class_gotomasses.inc b/gosa-plugins/goto/addons/goto/class_gotomasses.inc
index 00d46d86abaeed824aa5cb9c15b3dcbd8d393640..dcc2e935057ad4a9b1638ce469b7335977cb3ec3 100644 (file)
--- a/gosa-plugins/goto/addons/goto/class_gotomasses.inc
+++ b/gosa-plugins/goto/addons/goto/class_gotomasses.inc
@@ -344,7 +344,7 @@ class gotomasses extends plugin
     }
     if($this->acl_is_removeable()){
       $s.= "..|---|\n";
-      $s.= "..|<img src='images/alternatemail.png' alt='' border='0' class='center'>&nbsp;"._("Import")."|import_file\n";
+      $s.= "..|<img src='images/lists/import.png' alt='' border='0' class='center'>&nbsp;"._("Import")."|import_file\n";
       $s.= "..|<img src='images/lists/trash.png' alt='' border='0' class='center'>&nbsp;"._("Remove")."|remove_multiple\n";
     }
     if(preg_match("/w/",$this->getacl(""))){

diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_activate.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_activate.inc
index 64fc2d6d4eb0457317ac566449921b46c6cfffbc..5e7224d04799338f646dc7a3632ff379f4747eac 100644 (file)
--- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_activate.inc
+++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_activate.inc
@@ -53,7 +53,7 @@ class DaemonEvent_activate extends DaemonEvent
     $smarty->assign("target_list" , $this->get_target_list());
     $smarty->assign("is_new"      , $this->is_new);
     $smarty->assign("timestamp"   , $this->get_time_select());
-    $display.= $smarty->fetch(get_template_path('DaemonEvent_unlock.tpl', TRUE, dirname(__FILE__)));
+    $display.= $smarty->fetch(get_template_path('DaemonEvent_activate.tpl', TRUE, dirname(__FILE__)));
     $display.= $this->get_footer();
     return($display);
   }

diff --git a/gosa-plugins/goto/addons/goto/goto_import_file.tpl b/gosa-plugins/goto/addons/goto/goto_import_file.tpl
index 62d51b03e31e12a3f75a4afded67646351de2849..c3a1847c8d9391cd725ae297afe5b93e224001e0 100644 (file)
--- a/gosa-plugins/goto/addons/goto/goto_import_file.tpl
+++ b/gosa-plugins/goto/addons/goto/goto_import_file.tpl
@@ -3,11 +3,11 @@
 <table>
        <tr>    
                <td>
-                       {t}Select the file to import{/t}
+                       {t}Select the semicolon seperated list to import{/t}
                </td>
                <td>
                        <input type='file' name='file' value="{t}Browse{/t}">
-                       <input type='submit' name='import' value='{t}Load{/t}'>
+                       <input type='submit' name='import' value='{t}Upload{/t}'>
                </td>
        </tr>
        {if  $count}