Index: openacs-4/packages/static-portlet/static-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/static-portlet.info,v
diff -u -N -r1.30.2.4 -r1.30.2.5
--- openacs-4/packages/static-portlet/static-portlet.info	16 Sep 2021 08:27:31 -0000	1.30.2.4
+++ openacs-4/packages/static-portlet/static-portlet.info	22 Mar 2023 17:45:53 -0000	1.30.2.5
@@ -9,14 +9,14 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="2.10.0" url="http://openacs.org/repository/download/apm/static-portlet-2.10.0.apm">
+    <version name="2.11.0" url="http://openacs.org/repository/download/apm/static-portlet-2.11.0.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Portlet for the &quot;new-portal&quot; system for static pages</summary>
         <release-date>2021-09-15</release-date>
         <vendor url="http://dotlrn.org">DotLRN Consortium</vendor>
         <maturity>2</maturity>
 
-        <provides url="static-portlet" version="2.10.0"/>
+        <provides url="static-portlet" version="2.11.0"/>
         <requires url="dotlrn" version="2.10.0"/>
         <requires url="new-portal" version="2.10.0"/>
 
Index: openacs-4/packages/static-portlet/catalog/static-portlet.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/catalog/static-portlet.de_DE.ISO-8859-1.xml,v
diff -u -N -r1.15 -r1.15.10.1
--- openacs-4/packages/static-portlet/catalog/static-portlet.de_DE.ISO-8859-1.xml	10 Dec 2007 09:12:40 -0000	1.15
+++ openacs-4/packages/static-portlet/catalog/static-portlet.de_DE.ISO-8859-1.xml	22 Mar 2023 17:45:53 -0000	1.15.10.1
@@ -12,17 +12,18 @@
   <msg key="Edit_content_element">Inhalt bearbeiten</msg>
   <msg key="False_0">Falsch</msg>
   <msg key="File">Datei</msg>
-  <msg key="lt_Delete_element_pretty">%element_pretty_name% &quot;%pretty_name%&quot; l�schen</msg>
-  <msg key="lt_Editing_element_prett">%element_pretty_name% &quot;%pretty_name%&quot; bearbeiten</msg>
+  <msg key="lt_Delete_element_pretty">%element_pretty_name% &#34;%pretty_name%&#34; l�schen</msg>
+  <msg key="lt_Editing_element_prett">%element_pretty_name% &#34;%pretty_name%&#34; bearbeiten</msg>
   <msg key="lt_Enforce_this_applet_t">Erzwingen dass diese Anwendung im Portal erscheint</msg>
   <msg key="lt_Enforce_True_means_th">Erzwingen Wahr bedeutet, dass das statische Portlet \ sofort in die schon erstellten Ziel-Portale einbezogen wird; \ Falsch bedeutet, dass es zur Verf�gung steht, wenn das Portal angepasst wird oder wenn die Aktion Zur�cksetzen durchgef�hrt wird.
 </msg>
   <msg key="lt_strongNotestrong_You_">&lt;strong&gt;Hinweis&lt;/strong&gt;: Sie k�nnen f�r den Inhalt einfaches Textformat oder HTML verwenden.</msg>
-  <msg key="lt_Use_this_form_to_crea">Mit diesem Formular kann ein neues %element_pretty_name% erstellt werden. Es wird automatisch auf der ersten Seite des Portals &quot;%portal_name%&quot; platziert. Um es zu verschieben, gehen Sie unter '%control_panel_text%' auf 'Layout des Gruppenportals anpassen'.</msg>
+  <msg key="lt_Use_this_form_to_crea">Mit diesem Formular kann ein neues %element_pretty_name% erstellt werden. Es wird automatisch auf der ersten Seite des Portals &#34;%portal_name%&#34; platziert. Um es zu verschieben, gehen Sie unter &#39;%control_panel_text%&#39; auf &#39;Layout des Gruppenportals anpassen&#39;.</msg>
   <msg key="Name">Name</msg>
   <msg key="New">Neu</msg>
   <msg key="new_static_admin_portlet">Neues %element_pretty_name% erstellen</msg>
+  <msg key="portlet_title_exists_error">Ein Portlet mit diesem Namen existiert bereits in diesem Portal auf derselben Seite.</msg>
   <msg key="True">Wahr</msg>
-  <msg key="Use_this_form">Mit diesem Formular kann ein neues %element_pretty_name% erstellt werden. Es wird automatisch auf der ersten Seite des Portals &quot;%portal_name%&quot; platziert. Um es zu verschieben, gehen Sie auf der Verwaltungsseite auf 'Layout des Gruppenportals anpassen'</msg>
+  <msg key="Use_this_form">Mit diesem Formular kann ein neues %element_pretty_name% erstellt werden. Es wird automatisch auf der ersten Seite des Portals &#34;%portal_name%&#34; platziert. Um es zu verschieben, gehen Sie auf der Verwaltungsseite auf &#39;Layout des Gruppenportals anpassen&#39;</msg>
   <msg key="You_may_upload">Alternativ k�nnen Sie auch eine &lt;strong&gt;Text&lt;/strong&gt;datei hier hochladen und damit den derzeitigen Inhalt des Portlets ersetzen.</msg>
 </message_catalog>
Index: openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml,v
diff -u -N -r1.20 -r1.20.6.1
--- openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml	12 Jan 2010 17:25:42 -0000	1.20
+++ openacs-4/packages/static-portlet/catalog/static-portlet.en_US.ISO-8859-1.xml	22 Mar 2023 17:45:53 -0000	1.20.6.1
@@ -26,6 +26,7 @@
   <msg key="Name">Name</msg>
   <msg key="New">New</msg>
   <msg key="new_static_admin_portlet">New %element_pretty_name%</msg>
+  <msg key="portlet_title_exists_error">A portlet with this name already exists in this portal on the same page.</msg>
   <msg key="True">True</msg>
   <msg key="Use_this_form">Use this form to create a new %element_pretty_name%.  The %element_pretty_name%
 will be created and automatically placed on the first page of %portal_name% portal. Go to the administration page and select Customize Layout to move this %element_pretty_name%.</msg>
Index: openacs-4/packages/static-portlet/catalog/static-portlet.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/catalog/static-portlet.it_IT.ISO-8859-1.xml,v
diff -u -N -r1.14.10.1 -r1.14.10.2
--- openacs-4/packages/static-portlet/catalog/static-portlet.it_IT.ISO-8859-1.xml	19 Mar 2021 10:13:38 -0000	1.14.10.1
+++ openacs-4/packages/static-portlet/catalog/static-portlet.it_IT.ISO-8859-1.xml	22 Mar 2023 17:45:53 -0000	1.14.10.2
@@ -25,6 +25,7 @@
   <msg key="Name">Nome</msg>
   <msg key="New">Nuovo</msg>
   <msg key="new_static_admin_portlet">Nuovo %element_pretty_name%</msg>
+  <msg key="portlet_title_exists_error">Esiste gi� un portlet con questo nome in questo portale e sulla stessa pagina.</msg>
   <msg key="True">Vero</msg>
   <msg key="Use_this_form">Usa questa form per creare un nuovo %element_pretty_name%. Il %element_pretty_name% sar� creato e posto automaticamente sulla prima pagina del portale %portal_name%. Vai alla pagina di amministrazione e seleziona &amp;quot;Personalizza l&#39;Impaginazione&amp;quot; per disporre questo %element_pretty_name%.</msg>
   <msg key="You_may_upload">Oppure, puoi caricare un file di &lt;strong&gt;testo&lt;/strong&gt;, il contenuto del quale sostituir� il contenuto attuale del portlet.</msg>
Index: openacs-4/packages/static-portlet/www/element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/www/element.tcl,v
diff -u -N -r1.23.2.2 -r1.23.2.3
--- openacs-4/packages/static-portlet/www/element.tcl	18 Oct 2022 08:47:43 -0000	1.23.2.2
+++ openacs-4/packages/static-portlet/www/element.tcl	22 Mar 2023 17:45:53 -0000	1.23.2.3
@@ -15,8 +15,17 @@
 #
 
 ad_page_contract {
-    edit a static element
 
+    Create/Edit a custom Portlet.
+
+    This page implements the UI to create or edit a custom
+    Portlet. This can be specified either providing the content in a
+    textarea, or by uploading a text or HTML file from which the
+    content will be read.
+
+    Note that two forms with intersecting fields are rendered on the
+    page. The user is supposed to submit only one of them.
+
     @author arjun (arjun@openforce)
     @cvs-id $Id$
 } -query {
@@ -65,6 +74,30 @@
     ad_form -extend -name static_element -form $elements
 }
 
+
+#
+# This validation block will be used by both forms to check that we
+# are not creating a Portlet with an existing name on the same
+# page. This is not allowed and would throw an error down the line.
+#
+set portal_page_id [portal::get_page_id -portal_id $portal_id -sort_key 0]
+set unique_name_validation {
+    {pretty_name
+        {![db_0or1row check_unique_name_on_page {
+                select 1 from portal_element_map
+                where page_id     = :portal_page_id
+                and   pretty_name = :pretty_name
+                and   element_id <> :element_content_id
+        }]}
+        "#static-portlet.portlet_title_exists_error#"
+    }
+}
+
+ad_form -extend \
+    -name static_element \
+    -form {} \
+    -validate $unique_name_validation
+
 ad_form -extend -name static_element -form {
     {portal_id:text(hidden)     {value $portal_id}}
     {package_id:text(hidden)    {value $package_id}}
@@ -251,15 +284,23 @@
     ad_form -extend -name static_file -form $elements
 }
 
-ad_form -extend -name static_file -form {
-    {portal_id:text(hidden)     {value $portal_id}}
-    {package_id:text(hidden)    {value $package_id}}
-    {referer:text(hidden)       {value $referer}}
-} -validate {
+set validate {
     {upload_file
         {$upload_file ne ""}
         "[_ static-portlet.must_specify]"
     }
+}
+append validate $unique_name_validation
+
+ad_form -extend \
+    -name static_file \
+    -form {} \
+    -validate $unique_name_validation
+
+ad_form -extend -name static_file -form {
+    {portal_id:text(hidden)     {value $portal_id}}
+    {package_id:text(hidden)    {value $package_id}}
+    {referer:text(hidden)       {value $referer}}
 } -edit_request {
     db_1row get_content_element ""
     ad_set_form_values pretty_name