corrige les boutons pour editer en wiki

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@327 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs.net/wiki.php b/htdocs.net/wiki.php
index a021b2f..8d2925e 100644 (file)
--- a/htdocs.net/wiki.php
+++ b/htdocs.net/wiki.php
@@ -38,17 +38,17 @@ if ($globals->wiki->wikidir && $globals->xnet->wiki) {
         $DefaultPasswords['read'] = 'is_member:';
     }
     require_once("wiki.inc.php");
-    new_page($wiki_template, AUTH_PUBLIC);
+    $page->changeTpl($wiki_template);
+    $page->setType($globals->asso('cat'));
+    $page->addCssLink('css/wiki.css');
+    $page->useMenu();
     wiki_assign_auth();
 }
 
-$page->setType($globals->asso('cat'));
-$page->assign('xorg_extra_header', "<script type='text/JavaScript'>\n<!--\nNix={map:null,convert:function(a){Nix.init();var s='';for(i=0;i<a.length;i++){var b=a.charAt(i);s+=((b>='A'&&b<='Z')||(b>='a'&&b<='z')?Nix.map[b]:b);}return s;},init:function(){if(Nix.map!=null)return;var map=new Array();var s='abcdefghijklmnopqrstuvwxyz';for(i=0;i<s.length;i++)map[s.charAt(i)]=s.charAt((i+13)%26);for(i=0;i<s.length;i++)map[s.charAt(i).toUpperCase()]=s.charAt((i+13)%26).toUpperCase();Nix.map=map;},decode:function(a){document.write(Nix.convert(a));}}\n//-->\n</script>\n");
+if (!Env::get('action'))
+    $page->assign('xorg_extra_header', "<script type='text/JavaScript'>\n<!--\nNix={map:null,convert:function(a){Nix.init();var s='';for(i=0;i<a.length;i++){var b=a.charAt(i);s+=((b>='A'&&b<='Z')||(b>='a'&&b<='z')?Nix.map[b]:b);}return s;},init:function(){if(Nix.map!=null)return;var map=new Array();var s='abcdefghijklmnopqrstuvwxyz';for(i=0;i<s.length;i++)map[s.charAt(i)]=s.charAt((i+13)%26);for(i=0;i<s.length;i++)map[s.charAt(i).toUpperCase()]=s.charAt((i+13)%26).toUpperCase();Nix.map=map;},decode:function(a){document.write(Nix.convert(a));}}\n//-->\n</script>\n");
 $page->assign('is_member', is_member());
 $page->assign('has_perms', has_perms() || may_update());
 
-$page->addCssLink('css/wiki.css');
-$page->useMenu();
-
 $page->run();
 ?>

diff --git a/htdocs/wiki.php b/htdocs/wiki.php
index ea2af44..6969be1 100644 (file)
--- a/htdocs/wiki.php
+++ b/htdocs/wiki.php
@@ -32,10 +32,12 @@ new_skinned_page('wiki.tpl', Env::has('response') ? AUTH_MDP : AUTH_PUBLIC);
 if ($globals->wiki->wikidir) {
     $wikisite = 'xorg';
     require_once("wiki.inc.php");
-    new_skinned_page($wiki_template, AUTH_PUBLIC);
+    $page->changeTpl($wiki_template);
 }
 
-$page->assign('xorg_extra_header', "<script type='text/JavaScript'>\n<!--\nNix={map:null,convert:function(a){Nix.init();var s='';for(i=0;i<a.length;i++){var b=a.charAt(i);s+=((b>='A'&&b<='Z')||(b>='a'&&b<='z')?Nix.map[b]:b);}return s;},init:function(){if(Nix.map!=null)return;var map=new Array();var s='abcdefghijklmnopqrstuvwxyz';for(i=0;i<s.length;i++)map[s.charAt(i)]=s.charAt((i+13)%26);for(i=0;i<s.length;i++)map[s.charAt(i).toUpperCase()]=s.charAt((i+13)%26).toUpperCase();Nix.map=map;},decode:function(a){document.write(Nix.convert(a));}}\n//-->\n</script>\n");
+if (!Env::get('action'))
+    $page->assign('xorg_extra_header', "<script type='text/JavaScript'>\n<!--\nNix={map:null,convert:function(a){Nix.init();var s='';for(i=0;i<a.length;i++){var b=a.charAt(i);s+=((b>='A'&&b<='Z')||(b>='a'&&b<='z')?Nix.map[b]:b);}return s;},init:function(){if(Nix.map!=null)return;var map=new Array();var s='abcdefghijklmnopqrstuvwxyz';for(i=0;i<s.length;i++)map[s.charAt(i)]=s.charAt((i+13)%26);for(i=0;i<s.length;i++)map[s.charAt(i).toUpperCase()]=s.charAt((i+13)%26).toUpperCase();Nix.map=map;},decode:function(a){document.write(Nix.convert(a));}}\n//-->\n</script>\n");
+    
 wiki_assign_auth();
 $page->addCssLink('css/wiki.css');
 

diff --git a/plugins/pmwiki.platalSkin.php b/plugins/pmwiki.platalSkin.php
index 963aeba..98f34fb 100644 (file)
--- a/plugins/pmwiki.platalSkin.php
+++ b/plugins/pmwiki.platalSkin.php
@@ -3,6 +3,12 @@
 // set default author
 $Author = $_SESSION['forlife']."|".$_SESSION['prenom']." ".$_SESSION['nom'];
 
+$InputTags['e_form'] = array(
+  ':html' => "<form action='{\$PageUrl}?action=edit' method='post'><div><input 
+    type='hidden' name='action' value='edit' /><input 
+    type='hidden' name='n' value='{\$FullName}' /><input 
+    type='hidden' name='basetime' value='\$EditBaseTime' /></div>");
+    
 // set profiles to point to plat/al fiche
 Markup('[[~platal', '<[[~', '/\[\[~([^|\]]*)\|([^\]]*)\]\]/e',
     'PreserveText("=", \'<a href="'.$globals->baseurl

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index aa5f3a3..f6af18b 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -46,6 +46,10 @@
     {/foreach}
     <script type="text/javascript" src="{rel}/javascript/overlib.js"></script>
     
+    {if $xorg_extra_header}
+    {$xorg_extra_header|smarty:nodefaults}
+    {/if}
+
     {include file=skin/common.bandeau.head.tpl}
   </head>
   <body>