Index: openacs-4/packages/glossar/glossar.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/glossar.info,v
diff -u -N -r1.4 -r1.5
--- openacs-4/packages/glossar/glossar.info	2 Nov 2005 15:12:39 -0000	1.4
+++ openacs-4/packages/glossar/glossar.info	4 Aug 2006 11:37:00 -0000	1.5
@@ -7,7 +7,7 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="0.3d4" url="http://openacs.org/repository/download/apm/glossar-0.3d4.apm">
+    <version name="0.3d5" url="http://openacs.org/repository/download/apm/glossar-0.3d5.apm">
         <owner url="mailto:bjoern_kiesbye@web.de">Bjoern Kiesbye</owner>
         <owner url="mailto:sussdorff@sussdorff.org">Malte Sussdorff</owner>
         <summary>Glossars , translations for specific terms, and terms that shouldn't be used.   </summary>
@@ -16,7 +16,7 @@
         <description format="text/plain">Glossars , translations for specific terms, and terms that shouldn't be used.   </description>
         <maturity>0</maturity>
 
-        <provides url="glossar" version="0.3d4"/>
+        <provides url="glossar" version="0.3d5"/>
 
         <callbacks>
             <callback type="after-install"  proc="gl_glossar::install::create_install"/>
Index: openacs-4/packages/glossar/catalog/glossar.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/catalog/glossar.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.7 -r1.8
--- openacs-4/packages/glossar/catalog/glossar.de_DE.ISO-8859-1.xml	24 May 2006 06:12:31 -0000	1.7
+++ openacs-4/packages/glossar/catalog/glossar.de_DE.ISO-8859-1.xml	4 Aug 2006 11:37:00 -0000	1.8
@@ -7,11 +7,15 @@
   <msg key="Add_New_Translation">Neue �bersetzung hinzuf�gen</msg>
   <msg key="Add_New_translation">Neue �bersetzung hinzuf�gen</msg>
   <msg key="Add_new_Translation">Neue �bersetzung hinzuf�gen</msg>
+  <msg key="cancel_and_return">Abbrechen und zur�ck</msg>
   <msg key="Change_Glossar">Glossar �ndern</msg>
   <msg key="Comment">Formalien</msg>
+  <msg key="continue_with_delete">Fortfahren mit L�schen. &lt;font color=red&gt;Achtung!! Dies ist endg�ltig und kann nicht wieder r�ckg�ngig gemacht werden!! Hiermit gehen alle Glossardaten unwiderruflich verloren und k�nnen nicht wiederhergestellt werden!! Sind Sie wirklich absolut sicher?&lt;/font&gt;</msg>
   <msg key="Delete">Ausgew�hlte l�schen</msg>
+  <msg key="Delete_Glossar">Glossar l�schen</msg>
+  <msg key="Delete_Glossar_irreversibly">Glossar unwiderruflich l�schen</msg>
   <msg key="Edit_Glossar">Glossar editieren</msg>
-  <msg key="Edit_Term">Begriff editieren</msg>
+  <msg key="Edit_Term">Ausdruck editieren</msg>
   <msg key="File">Datei</msg>
   <msg key="Files">Dateien</msg>
   <msg key="files">Dateien</msg>
@@ -32,15 +36,18 @@
   <msg key="glossar_last_modified">Zuletzt ge�ndert</msg>
   <msg key="glossar_last_name">Nachname</msg>
   <msg key="glossar_modified_at">Ge�ndert am</msg>
-  <msg key="glossar_Move">Glossare umhaengen</msg>
+  <msg key="glossar_Move">Glossare verschieben</msg>
+  <msg key="glossar_move">Glossar verschieben</msg>
   <msg key="glossar_Move2">Glossare zu einem anderen Kunden wechseln</msg>
+  <msg key="glossar_move_search">Suche nach &lt;b&gt;Kunden&lt;/b&gt;:</msg>
   <msg key="glossar_New">Neu</msg>
   <msg key="glossar_New2">Neu</msg>
   <msg key="glossar_New_lekture">Neues Lektorat</msg>
   <msg key="glossar_New_term">Neuer Ausdruck</msg>
   <msg key="glossar_New_translation">Neue Uuml;bersetzung</msg>
   <msg key="glossar_no_label"></msg>
-  <msg key="glossar_organization">Kunde</msg>
+  <msg key="glossar_organization">Agentur</msg>
+  <msg key="glossar_owner">Glossar Eigent�mer</msg>
   <msg key="glossar_singel_text">Ausdruck</msg>
   <msg key="glossar_single_category">Sprache</msg>
   <msg key="glossar_source_category">Ausgangssprache</msg>
@@ -51,16 +58,19 @@
   <msg key="glossar_term_add">Ausdruck hinzuf�gen</msg>
   <msg key="glossar_term_edit">Aendern</msg>
   <msg key="glossar_term_history">Alle �nderungen</msg>
+  <msg key="Glossar_term_history_of">Alle �nderungen von</msg>
   <msg key="glossar_term_nr">Ausdruck Nr.</msg>
+  <msg key="glossar_term_search">Glossarausdruck Suche</msg>
   <msg key="glossar_title">Titel</msg>
-  <msg key="Glossars">Glossare</msg>
+  <msg key="Glossars">Glossar</msg>
   <msg key="map_category_tree">Kategorieb�ume verkn�pfen</msg>
   <msg key="New_Glossar">Neuer Glossar</msg>
   <msg key="New_Lecture">Neues Lektorats-Glossar</msg>
   <msg key="New_Translation">Neues �bersetzungsglossar</msg>
   <msg key="None">Keine Glossare vorhanden!</msg>
   <msg key="Rename">Umbenennen</msg>
   <msg key="Search">Suche</msg>
+  <msg key="search">Suche</msg>
   <msg key="set_permissions">Berechtigungen setzen</msg>
   <msg key="term_None">Keine Ausdr�cke vorhanden!</msg>
   <msg key="Terms">Begriffe</msg>
Index: openacs-4/packages/glossar/catalog/glossar.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/catalog/glossar.en_US.ISO-8859-1.xml,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/glossar/catalog/glossar.en_US.ISO-8859-1.xml	4 Jan 2006 08:09:35 -0000	1.6
+++ openacs-4/packages/glossar/catalog/glossar.en_US.ISO-8859-1.xml	4 Aug 2006 11:37:00 -0000	1.7
@@ -7,9 +7,13 @@
   <msg key="Add_New_Translation">Add New Translation</msg>
   <msg key="Add_New_translation">Add New Translation</msg>
   <msg key="Add_new_Translation">Add new Translation</msg>
+  <msg key="cancel_and_return">Cancel and Return</msg>
   <msg key="Change_Glossar">Change Glossar</msg>
   <msg key="Comment">Comment</msg>
+  <msg key="continue_with_delete">Continue with delete. &lt;font color=red&gt;Warning!! This is final and cannot be undone!!&lt;/font&gt;</msg>
   <msg key="Delete">Delete selected</msg>
+  <msg key="Delete_Glossar">Delete Glossar(y)</msg>
+  <msg key="Delete_Glossar_irreversibly">Delete glossar(y) irreversibly</msg>
   <msg key="Edit_Glossar">Edit Glossar</msg>
   <msg key="Edit_Term">Edit Term</msg>
   <msg key="File">File</msg>
@@ -33,14 +37,17 @@
   <msg key="glossar_last_name">Sir Name</msg>
   <msg key="glossar_modified_at">Modified on</msg>
   <msg key="glossar_Move">Move Glossars</msg>
+  <msg key="glossar_move">Move glossar</msg>
   <msg key="glossar_Move2">Moves glossars to another customer</msg>
+  <msg key="glossar_move_search">Search for &lt;b&gt;Customers&lt;/b&gt; who's name contains:</msg>
   <msg key="glossar_New">New</msg>
   <msg key="glossar_New2">New</msg>
   <msg key="glossar_New_lekture">New Lecture</msg>
   <msg key="glossar_New_term">New Term</msg>
   <msg key="glossar_New_translation">New Translation</msg>
   <msg key="glossar_no_label"></msg>
   <msg key="glossar_organization">Customer</msg>
+  <msg key="glossar_owner">Glossar owner</msg>
   <msg key="glossar_singel_text">Term</msg>
   <msg key="glossar_single_category">Language</msg>
   <msg key="glossar_source_category">Source Language</msg>
@@ -51,7 +58,9 @@
   <msg key="glossar_term_add">Glossar Term Add</msg>
   <msg key="glossar_term_edit">Edit</msg>
   <msg key="glossar_term_history">History</msg>
+  <msg key="Glossar_term_history_of">Changes of</msg>
   <msg key="glossar_term_nr">Term Nr.</msg>
+  <msg key="glossar_term_search">Glossar term search</msg>
   <msg key="glossar_title">Title</msg>
   <msg key="Glossars">Glossars</msg>
   <msg key="index">index</msg>
@@ -62,6 +71,7 @@
   <msg key="None">No Glossars exist!</msg>
   <msg key="Rename">Rename</msg>
   <msg key="Search">Search</msg>
+  <msg key="search">Search</msg>
   <msg key="set_permissions">Set permissions</msg>
   <msg key="term_None">No Terms found!</msg>
   <msg key="Terms">Terms</msg>
Index: openacs-4/packages/glossar/lib/glossar-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/lib/glossar-list.tcl,v
diff -u -N -r1.9 -r1.10
--- openacs-4/packages/glossar/lib/glossar-list.tcl	24 May 2006 06:12:31 -0000	1.9
+++ openacs-4/packages/glossar/lib/glossar-list.tcl	4 Aug 2006 11:37:01 -0000	1.10
@@ -34,6 +34,8 @@
 set user_id [ad_conn user_id]
 set contact_id $owner_id
 
+set return_url [export_vars -base [ad_conn url] {contact_id}] 
+
 if {[empty_string_p $user_id]} {
     ad_redirect_for_registration
 }
@@ -86,6 +88,8 @@
 
 if [permission::permission_p -object_id $owner_id -privilege admin] {
 
+    # solution changend, this is old code... set row_list [list checkbox {} title {} source_category {} target_category {} glossar_edit {} glossar_delete {} glossar_files {}]
+ 
 } elseif {[permission::permission_p -object_id $owner_id -privilege create] || [group::member_p -group_name Employees]} {
 
     set user_perm create
@@ -128,7 +132,7 @@
 		label {[_ glossar.glossar_target_category]}
 	    }
 	    glossar_edit {
-		display_template {<a href="@gl_glossar.edit_url@"><img border="0" src="/shared/images/Edit16.gif" alt="#acs-kernel.common_Edit#" /></a>}
+		display_template {@gl_glossar.edit_delete_link;noquote@}
 	    }	
 	    glossar_perm {
 		display_template {<a href="@gl_glossar.permission_url@"><img border="0" src="/glossar/resources/padlock.gif" alt="#glossar.set_permissions#" /></a>}
@@ -180,7 +184,7 @@
 
 
 
-    db_multirow -extend {source_category target_category gl_translation_p files_url edit_url permission_url title_url target_url files_count} gl_glossar gl_glossar  {} {
+    db_multirow -extend {source_category target_category gl_translation_p files_url edit_delete_link permission_url title_url target_url files_count} gl_glossar gl_glossar  {} {
 	if {![empty_string_p $target_category_id]} {
 	    set gl_translation_p 1
 	} else {
@@ -191,9 +195,16 @@
 	set target_category "[category::get_name $target_category_id]"
 	set title_url "[export_vars -base "${base_url}/glossar-term-list" {glossar_id contact_id}]"
 	set edit_url "[export_vars -base "${base_url}/glossar-edit" {glossar_id contact_id}]"
+	set delete_url "[export_vars -base "${base_url}/glossar-delete" {glossar_id return_url}]"  
 	set permission_url "[export_vars -base "/permissions/one" {{object_id $glossar_id} {application_url [ad_return_url]}}]"
 	set files_url "[export_vars -base "${base_url}/glossar-file-upload" {glossar_id contact_id}]"
 	set target_url "/contacts/$organization_id"
+	set edit_delete_link "<pre><a href=\"$edit_url\"><img border=\"0\" src=\"/shared/images/Edit16.gif\" alt=\"#acs-kernel.common_Edit#\" /></a>"
+        if [permission::permission_p -object_id $owner_id -privilege admin] { 
+	    append edit_delete_link " <a href=\"$delete_url\"><img border=\"0\" src=\"/shared/images/Delete16.gif\" alt=\"\#acs-kernel.common_Delete\#\" /></a></pre>"
+	}  else {
+	    append edit_delete_link "</pre>"
+	}
     } if_no_rows {
     }
 }
\ No newline at end of file
Index: openacs-4/packages/glossar/lib/glossar-term-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/lib/glossar-term-list.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/glossar/lib/glossar-term-list.tcl	24 May 2006 06:12:31 -0000	1.6
+++ openacs-4/packages/glossar/lib/glossar-term-list.tcl	4 Aug 2006 11:37:01 -0000	1.7
@@ -6,6 +6,7 @@
 # @creation-date 2005-07-10
 # @arch-tag: beb88796-955e-4cbd-af5e-3919597c7ed1
 # @cvs-id $Id$
+# 2006/08/03 nfl/cognovis: with delete term functionality
 
 foreach required_param {glossar_id contact_id searchterm} {
     if {![info exists $required_param]} {
@@ -24,6 +25,8 @@
 set glossar_language [category::get_name $source_category_id]
 set glossar_target_lan [category::get_name $target_category_id]
 set user_id [ad_conn user_id]
+#set return_url [ad_conn url]
+set return_url [export_vars -base [ad_conn url] {glossar_id contact_id}]
 set locale [lang::user::site_wide_locale -user_id $user_id]
 set time_format "[lc_get -locale $locale d_fmt] %X"
 set freelancer_p [group::member_p -user_id $user_id -group_name Freelancer]
@@ -52,7 +55,7 @@
 
 
 if {$format == "normal"} {
-    set row_list [list source_text {} target_text {} dont_text {} description {} owner {} last_modified {} creation_user {} edit {} history {}]
+    set row_list [list source_text {} target_text {} dont_text {} description {} owner {} last_modified {} creation_user {} edit {} delete {} history {}]
 } else {
     set row_list [list source_text {} target_text {} dont_text {} description {} owner {} last_modified {} creator_name {}] 
 }
@@ -191,6 +194,10 @@
 	    label " "
 	    display_template {<a href="@gl_term.edit_url@"><img border="0" src="/shared/images/Edit16.gif" alt="#acs-kernel.common_Edit#" /></a>}
 	}
+        delete {
+            label " "
+            display_template {<a href="@gl_term.delete_url@"><img border="0" src="/shared/images/Delete16.gif" alt="\#acs-kernel.common_Delete\#" /></a>}
+        }   
 	history {
 	    label " "
 	    display_template {<a href="@gl_term.history_url@">#glossar.glossar_term_history#</a>}
@@ -270,7 +277,7 @@
 
 set hidden_vars [export_vars -form {glossar_id gl_translation_p orderby format page owner_id customer_id contact_id }] 
 
-db_multirow  -extend {gl_translation_p creator_url creator_name edit_url history_url owner} gl_term gl_term  {} {
+db_multirow  -extend {gl_translation_p creator_url creator_name edit_url delete_url history_url owner} gl_term gl_term  {} {
     if {![empty_string_p $target_text]} {
 	set gl_translation_p 1
     } else {
@@ -292,6 +299,7 @@
     set last_modified [lc_time_fmt $last_modified $time_format]
     set creator_url [acs_community_member_url -user_id $creation_user]
     set edit_url [export_vars -base glossar-term-add {glossar_id term_id contact_id}]
+    set delete_url [export_vars -base glossar-term-delete {term_id return_url}]
     set history_url [export_vars -base glossar-term-rev-list {glossar_id term_id contact_id}]
 } if_no_rows {}
 
Index: openacs-4/packages/glossar/tcl/glossar-callback-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/tcl/glossar-callback-procs.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossar/tcl/glossar-callback-procs.tcl	4 Jan 2006 08:09:38 -0000	1.1
+++ openacs-4/packages/glossar/tcl/glossar-callback-procs.tcl	4 Aug 2006 11:37:01 -0000	1.2
@@ -9,7 +9,7 @@
 }
 
 
-ad_proc -public -callback gl_glossar::install::after_instantiate {
+ad_proc -public -callback glossar::install::after_instantiate {
     {-package_id:required}
 } {
 }
Index: openacs-4/packages/glossar/tcl/glossar-install-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/tcl/glossar-install-procs.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/glossar/tcl/glossar-install-procs.tcl	4 Jan 2006 08:09:38 -0000	1.6
+++ openacs-4/packages/glossar/tcl/glossar-install-procs.tcl	4 Aug 2006 11:37:01 -0000	1.7
@@ -12,9 +12,9 @@
 
 
 
-namespace eval gl_glossar::install {}
+namespace eval glossar::install {}
 
-ad_proc -public gl_glossar::install::create_install {
+ad_proc -public glossar::install::create_install {
 } {
     Creates the content types and adds the attributes.
 } {
@@ -36,7 +36,7 @@
 
 }
 
-ad_proc -public gl_glossar::install::package_instantiate {
+ad_proc -public glossar::install::package_instantiate {
     -package_id:required
 } {
     Define folders
@@ -51,11 +51,11 @@
     package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "#glossar.from_default_object_id#"]] acs_object
     package_instantiate_object -package_name acs_object -var_list [list [list new__context_id $package_id] [list new__package_id $package_id] [list new__title "#glossar.to_default_object_id#"]] acs_object
 
-    callback gl_glossar::install::after_instantiate -package_id $package_id
+    callback glossar::install::after_instantiate -package_id $package_id
 }
 
 
-ad_proc -public gl_glossar::install::package_upgrade {
+ad_proc -public glossar::install::package_upgrade {
     {-from_version_name:required}
     {-to_version_name:required}
 } {
Index: openacs-4/packages/glossar/tcl/glossar-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/tcl/glossar-procs.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossar/tcl/glossar-procs.tcl	2 Nov 2005 15:12:40 -0000	1.2
+++ openacs-4/packages/glossar/tcl/glossar-procs.tcl	4 Aug 2006 11:37:01 -0000	1.3
@@ -5,15 +5,20 @@
     
     
     @author Bjoern Kiesbye (bjoern_kiesbye@web.de)
+    @author Nils Lohse (nils.lohse@cognovis.de)
     @creation-date 2005-07-06
     @arch-tag: b4f83a02-5128-4d28-a681-b73b7ffdb205
     @cvs-id $Id$
 }
 
 
-namespace eval gl_glossar {}
+#namespace eval gl_glossar {}
+# 2006/08/03 cognovis/nfl: namespace change from gl_glossar to glossar
+namespace eval glossar {}
+namespace eval glossar::glossary {}
+namespace eval glossar::term {}
 
-ad_proc -public gl_glossar::new {
+ad_proc -public glossar::glossary::new {
 
     -owner_id:required
     -source_category_id:required
@@ -35,8 +40,9 @@
     }
     set folder_id [content::folder::get_folder_from_package -package_id $package_id]
 
+    set item_id [db_nextval acs_object_id_seq]
+
     db_transaction {
-	set item_id [db_nextval acs_object_id_seq]
 	if {[empty_string_p $name]} {
 	    set name "gl_glossar_$item_id"
 	}
@@ -59,7 +65,7 @@
 }
 
 
-ad_proc -public gl_glossar::edit {
+ad_proc -public glossar::glossary::edit {
     -glossar_item_id:required
     -owner_id:required
     -source_category_id:required
@@ -74,27 +80,24 @@
 
     Edit Glossar
 } {
-    db_transaction {
-	set new_rev_id [content::revision::new \
-			    -item_id $glossar_item_id \
-			    -content_type {gl_glossar} \
-			    -title $title \
-			    -description $description \
-			    -attributes [list \
-					     [list owner_id $owner_id] \
-					     [list source_category_id $source_category_id] \
-					     [list target_category_id $target_category_id] \
-					     [list etat_id $etat_id] \
-					    ] ]
-    }
-
+    set new_rev_id [content::revision::new \
+			-item_id $glossar_item_id \
+			-content_type {gl_glossar} \
+			-title $title \
+			-description $description \
+			-attributes [list \
+					 [list owner_id $owner_id] \
+					 [list source_category_id $source_category_id] \
+					 [list target_category_id $target_category_id] \
+					 [list etat_id $etat_id] \
+					] ]
     return $new_rev_id
 }
 
 
 
 
-ad_proc -public gl_glossar::term_new {
+ad_proc -public glossar::term::new {
     -glossar_id:required
     {-term_id ""}
     {-source_text ""}
@@ -118,8 +121,8 @@
     }
 
 
+    set item_id [db_nextval acs_object_id_seq]
     db_transaction {
-	set item_id [db_nextval acs_object_id_seq]
 	if {[empty_string_p $name]} {
 	    set name "gl_glossar_term_$item_id"
 	}
@@ -143,7 +146,7 @@
 
 
 
-ad_proc -public gl_glossar::term_edit {
+ad_proc -public glossar::term::edit {
     -term_id:required
     {-source_text ""}
     {-target_text ""}
@@ -159,20 +162,56 @@
 
     Edit Glossar Term
 } {
-    db_transaction {
-	set new_rev_id [content::revision::new \
-			    -item_id $term_id \
-			    -content_type {gl_glossar_term} \
-			    -title $title \
-			    -description $description \
-			    -attributes [list \
-					     [list source_text $source_text] \
-					     [list target_text $target_text] \
-					     [list dont_text $dont_text] \
-					     [list owner_id $customer_id]
-					] ]
-    }
-
+    set new_rev_id [content::revision::new \
+			-item_id $term_id \
+			-content_type {gl_glossar_term} \
+			-title $title \
+			-description $description \
+			-attributes [list \
+					 [list source_text $source_text] \
+					 [list target_text $target_text] \
+					 [list dont_text $dont_text] \
+					 [list owner_id $customer_id]
+				    ] ]
     return $new_rev_id
 }
 
+
+
+# created 2006/08/03 by cognovis/nfl
+ad_proc -public glossar::term::delete {
+    -term_id:required
+} {
+    @author Nils Lohse (nils.lohse@cognovis.de)
+    @creation-date 2006-08-03
+
+    Delete Glossar Term
+} {      
+    db_transaction {
+	permission::require_write_permission -object_id $term_id
+        ns_log Notice "Deleting glossar term $term_id"
+	content::item::delete -item_id $term_id
+    }     
+}
+
+# created 2006/08/03 by cognovis/nfl
+# finished 2006/08/04 by cognovis/nfl  
+ad_proc -public glossar::glossary::delete {
+    -glossar_item_id:required
+} {
+    @author Nils Lohse (nils.lohse@cognovis.de)
+    @creation-date 2006-08-03
+
+    Delete Glossar
+} {
+    #db_transaction {
+	# First, delete all terms
+        # ... it's done automatically by deleting the glossar itself. Cool.
+	# Second, delete the Glossar itself
+	db_transaction {
+	    permission::require_write_permission -object_id $glossar_item_id
+	    ns_log Notice "Deleting glossar $glossar_item_id"
+	    content::item::delete -item_id $glossar_item_id
+	}    
+    #}
+}
Index: openacs-4/packages/glossar/www/glossar-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/glossar-add.tcl,v
diff -u -N -r1.6 -r1.7
--- openacs-4/packages/glossar/www/glossar-add.tcl	24 May 2006 06:12:31 -0000	1.6
+++ openacs-4/packages/glossar/www/glossar-add.tcl	4 Aug 2006 11:37:01 -0000	1.7
@@ -114,11 +114,11 @@
 	set target_category_id [db_null]
     }
     
-    gl_glossar::new -owner_id $owner_id -title "$title" -description "$description" -source_category_id $source_category_id -target_category_id $target_category_id -package_id $package_id -etat_id ""
+    glossar::glossary::new -owner_id $owner_id -title "$title" -description "$description" -source_category_id $source_category_id -target_category_id $target_category_id -package_id $package_id -etat_id ""
 
 } -edit_data {
 
-    gl_glossar::edit -glossar_item_id $glossar_id -title "$title" -description "$description" -source_category_id $source_category_id  -target_category_id $target_category_id -owner_id $owner_id -etat_id ""
+    glossar::glossary::edit -glossar_item_id $glossar_id -title "$title" -description "$description" -source_category_id $source_category_id  -target_category_id $target_category_id -owner_id $owner_id -etat_id ""
 
 } -after_submit {
     ad_returnredirect "/contacts/$old_owner_id"
Index: openacs-4/packages/glossar/www/glossar-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/glossar-delete.tcl,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/glossar/www/glossar-delete.tcl	20 Aug 2005 09:37:51 -0000	1.1
+++ openacs-4/packages/glossar/www/glossar-delete.tcl	4 Aug 2006 11:37:01 -0000	1.2
@@ -1,19 +1,49 @@
 ad_page_contract {
+    Delete a glossar with confirmation
 
-    Update sort order
-
-    @author Matthew Geddert openacs@geddert.com
-    @creation-date 2005-05-24
-    @cvs-id $Id$
-
+    @author Nils Lohse (nils.lohse@cognovis.de)
+    @creation-date 2006-08-03
 } {
-    item_id:multiple,notnull
-    glossar_id
+    glossar_id:integer
+    return_url
+} -properties {
+    context:onevalue
+    page_title:onevalue
 }
 
-db_transaction {
-    foreach item_id $item_id {
-	db_dml expire_item { update cr_items set publish_status = 'expired', live_revision = NULL where item_id = :item_id }
+# i18n
+# glossar.Delete_Glossar
+# glossar.Delete_Glossar_irreversibly
+# glossar.continue_with_delete
+# glossar.cancel_and_return
+
+set user_id [auth::require_login]
+
+set page_title "[_ glossar.Delete_Glossar]"
+
+set context [list $page_title]
+
+set confirm_options [list [list "[_ glossar.continue_with_delete]" t] [list "[_ glossar.cancel_and_return]" f]]
+
+set glossar_name [content::item::get_title -item_id $glossar_id]
+
+ad_form -name delete_confirm -action glossar-delete -form {
+    {glossar_id:key}
+    {glossar_name:text(inform) {label "[_ glossar.Delete_Glossar_irreversibly]"}}
+    {confirmation:text(radio) {label " "} {options $confirm_options} {value f}}
+    {return_url:text(hidden)}
+} -edit_request {
+} -on_submit {
+    if {$confirmation == "t"} {
+	glossar::glossary::delete -glossar_item_id $glossar_id
     }
+} -after_submit {
+    if {$confirmation == "t"} {
+	ad_returnredirect $return_url
+    } else {
+	ad_returnredirect $return_url
+    }
+    ad_script_abort
 }
-ad_returnredirect "glossar-file-upload?glossar_id=$glossar_id"
+
+ad_return_template
Index: openacs-4/packages/glossar/www/glossar-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/glossar-edit.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/glossar/www/glossar-edit.tcl	24 May 2006 06:12:31 -0000	1.5
+++ openacs-4/packages/glossar/www/glossar-edit.tcl	4 Aug 2006 11:37:01 -0000	1.6
@@ -97,7 +97,7 @@
 	db_1row get_rel_id2 {}
     }
 
-    gl_glossar::edit -glossar_item_id $glossar_id -title $title -description $description -source_category_id $source_category_id  -target_category_id $target_category_id -owner_id $owner_id -etat_id ""
+    glossar::glossary::edit -glossar_item_id $glossar_id -title $title -description $description -source_category_id $source_category_id  -target_category_id $target_category_id -owner_id $owner_id -etat_id ""
 
 
 } -after_submit {
Index: openacs-4/packages/glossar/www/glossar-term-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/glossar-term-add.tcl,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/glossar/www/glossar-term-add.tcl	26 May 2006 10:51:38 -0000	1.5
+++ openacs-4/packages/glossar/www/glossar-term-add.tcl	4 Aug 2006 11:37:01 -0000	1.6
@@ -37,7 +37,16 @@
     and gi.item_id = :glossar_id
 }
 
-ad_form -name glossar-term-add -export {glossar_id contact_id} -form {
+
+set edit_buttons [list]
+
+lappend edit_buttons [list "[_ acs-kernel.common_Save]" "ok" ]
+
+if {![exists_and_not_null term_id]} {
+    lappend edit_buttons [list "[_ acs-kernel.common_Next] >" "next" ]
+}
+
+ad_form -name glossar-term-add -edit_buttons $edit_buttons -export {glossar_id contact_id} -form {
     {term_id:key}
 }
 
@@ -81,13 +90,21 @@
 } -new_data {
     
 
-	set term_id [gl_glossar::term_new -term_id $term_id -glossar_id $glossar_id -source_text "$source_text" -target_text "$target_text" -dont_text "$dont_text" -description "$description"]
+	set term_id [glossar::term::new -term_id $term_id -glossar_id $glossar_id -source_text "$source_text" -target_text "$target_text" -dont_text "$dont_text" -description "$description"]
     
 } -edit_data {
-        gl_glossar::term_edit  -term_id $term_id -source_text $source_text -target_text $target_text -dont_text $dont_text -description $description
+        glossar::term::edit  -term_id $term_id -source_text $source_text -target_text $target_text -dont_text $dont_text -description $description
 } -after_submit {
 
-    ad_returnredirect [export_vars -base glossar-term-list {glossar_id contact_id}]
+    set button [form::get_button glossar-term-add]
+
+    if { ![string equal $button "ok"] } {
+	set return_url  "[export_vars -base glossar-term-add {glossar_id contact_id}]"
+    } else {
+	set return_url "[export_vars -base glossar-term-list {glossar_id contact_id}]"
+    }
+
+    ad_returnredirect $return_url
     ad_script_abort
 }
 
Index: openacs-4/packages/glossar/www/glossar-term-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/glossar-term-edit.tcl,v
diff -u -N -r1.2 -r1.3
--- openacs-4/packages/glossar/www/glossar-term-edit.tcl	23 Aug 2005 19:40:47 -0000	1.2
+++ openacs-4/packages/glossar/www/glossar-term-edit.tcl	4 Aug 2006 11:37:01 -0000	1.3
@@ -56,5 +56,5 @@
 } -edit_data {
 
 
-    gl_glossar::term_edit -glossar_id $glossar_id -source_text $source_text -target_text $target_text -dont_text $dont_text -comment $commnet
+    glossar::term::edit -glossar_id $glossar_id -source_text $source_text -target_text $target_text -dont_text $dont_text -comment $commnet
 }
Index: openacs-4/packages/glossar/www/move-glossar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/glossar/www/move-glossar.tcl,v
diff -u -N -r1.3 -r1.4
--- openacs-4/packages/glossar/www/move-glossar.tcl	24 May 2006 06:12:31 -0000	1.3
+++ openacs-4/packages/glossar/www/move-glossar.tcl	4 Aug 2006 11:37:01 -0000	1.4
@@ -29,7 +29,7 @@
 	    and exists (select 1 from acs_rels where rel_id = :old_owner_id)
 	}
     
-	gl_glossar::edit -glossar_item_id $id \
+	glossar::glossary::edit -glossar_item_id $id \
 	    -owner_id $owner_id \
 	    -source_category_id $source_category_id\
 	    -target_category_id $target_category_id\