Item15219: prevent autolinking in title

foswiki · Sep 29, 2023 · 0e7e2c3 · 0e7e2c3
1 parent 3abe142
commit 0e7e2c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm b/NatEditPlugin/lib/Foswiki/Plugins/NatEditPlugin.pm
@@ -30,8 +30,8 @@ BEGIN {
     }
 }
 
-our $VERSION           = '9.65';
-our $RELEASE           = '04 Sep 2023';
+our $VERSION           = '9.66';
+our $RELEASE           = '29 Sep 2023';
 our $NO_PREFS_IN_TOPIC = 1;
 our $SHORTDESCRIPTION  = 'A Wikiwyg Editor';
 our $baseWeb;

diff --git a/NatEditPlugin/pub/System/NatEditPlugin/styles.uncompressed.css b/NatEditPlugin/pub/System/NatEditPlugin/styles.uncompressed.css
@@ -198,7 +198,6 @@
 .natEditMinorChange label,
 .natEditMinorChange input {
   margin:4px;
-  border:0px;
   vertical-align:middle;
 }
 

diff --git a/NatEditPlugin/templates/edit.natedit.tmpl b/NatEditPlugin/templates/edit.natedit.tmpl
@@ -11,18 +11,18 @@
 }%%TMPL:END%
 %TMPL:DEF{"pagetitlestylewrapper"}%%{}%%TMPL:END%
 
-%TMPL:DEF{"contenttitle"}%%TMPL:P{context="TopicTitleEnabled" then="contenttitle::topictitle" else="contenttitle::default"}%%TMPL:END%
+%TMPL:DEF{"contenttitle"}%<noautolink>%TMPL:P{context="TopicTitleEnabled" then="contenttitle::topictitle" else="contenttitle::default"}%</noautolink>%TMPL:END%
 
 %TMPL:DEF{"contenttitle::topictitle"}%<h1 class="natEditTitle">%IF{
   "istopic '%WEB%.%TOPIC%'" 
   then="<a href='%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%' target='_blank'>%URLPARAM{"TopicTitle" default="%TMPL:P{"topictitle" hideautoinc="off"}%"}%</a>" 
-  else="<nop>%URLPARAM{"TopicTitle" default="%TMPL:P{"topictitle" hideautoinc="off"}%"}% <span class='natEditTitleStatus'>(%TMPL:P{"titleaction"}%)</span>"
+  else="%URLPARAM{"TopicTitle" default="%TMPL:P{"topictitle" hideautoinc="off"}%"}% <span class='natEditTitleStatus'>(%TMPL:P{"titleaction"}%)</span>"
 }%</h1>%TMPL:END%
 
 %TMPL:DEF{"contenttitle::default"}%<h1 class="natEditTitle">%IF{
   "istopic '%WEB%.%TOPIC%'" 
   then="<a href='%SCRIPTURLPATH{"view"}%/%WEB%/%TOPIC%' target='_blank'>%TOPIC%</a>" 
-  else="<nop>%TOPIC% <span class='natEditTitleStatus'>(%TMPL:P{"titleaction"}%)</span>"
+  else="%TOPIC% <span class='natEditTitleStatus'>(%TMPL:P{"titleaction"}%)</span>"
 }%</h1>%TMPL:END%
 
 %TMPL:DEF{"windowtitle"}%<title>(%TMPL:P{"titleaction"}%) <nop>%BASETOPIC%%TMPL:P{"titlesep"}%%BASEWEB%%TMPL:P{"titlesep"}%<nop>%WIKITOOLNAME%</title>%TMPL:END%