rewrite create new flyspray task to put in xnet

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

diff --git a/htdocs/css/flyspray.css b/htdocs/css/flyspray.css
deleted file mode 100644 (file)
index 395a6db..0000000
--- a/htdocs/css/flyspray.css
+++ /dev/null
@@ -1,25 +0,0 @@
-#flyspray_report {
-       display:none;
-       position:fixed;
-       width:60%;
-       height:470px;
-       top:20%;
-       left:20%;
-       border: solid 1px;
-       background:white;
-       color:black;
-       text-align:left;
-}
-#flyspray_report div {
-       margin-left:10%;
-       margin-right:10%;
-}
-#flyspray_report textarea {
-       width:100%;
-       margin-bottom:10px;
-       height:300px;
-       display:block;
-}
-#flyspray_submit {
-       text-align:center;
-}
\ No newline at end of file

diff --git a/templates/skin/common.bug.tpl b/templates/skin/common.bug.tpl
new file mode 100644 (file)
index 0000000..a06085f
--- /dev/null
+++ b/templates/skin/common.bug.tpl
@@ -0,0 +1,38 @@
+<script type="text/javascript" src="javascript/flyspray.js"></script>\r
+\r
+<div id="flyspray_report" style="display:none;position:fixed;width:60%;height:470px;top:20%;left:20%;border: solid 1px;background:white;color:black;text-align:left;padding:10px">\r
+<form action="http://trackers.polytechnique.org/" method="post" enctype="multipart/form-data">\r
+       <h1>Signaler un bug ou demander une amélioration</h1>\r
+       <div style="margin-left:10%;margin-right:10%">\r
+               <input type="hidden" name="do" value="modify"/>\r
+               <input type="hidden" name="action" value="newtask"/>\r
+               <input type="hidden" name="project_id" value="1"/>\r
+               <select name="task_type">\r
+           <option value="1">Bug</option>\r
+                       <option value="2">Wish</option>\r
+               </select>\r
+               <input type="text" name="item_summary" id="flyspray_title" value="sur la page {$smarty.server.REQUEST_URI}" size="50" maxlength="100"/>\r
+               <input type="hidden" name="productcategory" value="1"/><!-- non trié -->\r
+               <input type="hidden" name="itemstatus" value="2"/><!-- New -->\r
+               <input type="hidden" name="assigned_to" value="0"/><!-- No one -->\r
+               <input type="hidden" name="operating_system" value="1"/><!-- All -->\r
+               <input type="hidden" name="task_severity" value="2"/><!-- Low -->\r
+               <input type="hidden" name="task_priority" value="2"/><!-- Normal -->\r
+               <input type="hidden" name="productversion" value=""/><!-- ??? -->\r
+               <input type="hidden" name="closedbyversion" value=""/><!-- Undecided -->\r
+               <input type="hidden" name="due_date" value=""/>\r
+               <textarea name="detailed_desc" id="flyspray_detail" cols="70" rows="10" style="width:100%;margin-bottom:10px;height:300px;display:block;">\r
+\r
+** Explique ici le problème ou l'amélioration proposée **\r
+               \r
+Page : {#globals.baseurl#}/?{$smarty.server.QUERY_STRING}\r
+Navigateur : {$smarty.server.HTTP_USER_AGENT}\r
+Skin : {$smarty.session.skin} \r
+Signalé par {$smarty.session.forlife}</textarea>\r
+               <div style="text-align:center">\r
+                       <input type="button" value="Fermer" onclick="close_bug(this.form,false)"/>\r
+                       <input type="button" value="Signaler le bug" onclick="close_bug(this.form,true)"/>\r
+               </div>\r
+       </div>\r
+</form>\r
+</div>\r

diff --git a/templates/skin/common.footer.tpl b/templates/skin/common.footer.tpl
index d91c1bd..163eac3 100644 (file)
--- a/templates/skin/common.footer.tpl
+++ b/templates/skin/common.footer.tpl
@@ -20,43 +20,6 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<div id="flyspray_report">
-<form action="http://trackers.polytechnique.org/" method="post" enctype="multipart/form-data">
-       <h1>Signaler un bug ou demander une amélioration</h1>
-       <div>
-               <input type="hidden" name="do" value="modify"/>
-               <input type="hidden" name="action" value="newtask"/>
-               <input type="hidden" name="project_id" value="1"/>
-               <select name="task_type">
-           <option value="1">Bug</option>
-                       <option value="2">Wish</option>
-               </select>
-               <input type="text" name="item_summary" id="flyspray_title" value="sur la page {$smarty.server.REQUEST_URI}" size="50" maxlength="100"/>
-               <input type="hidden" name="productcategory" value="1"/><!-- non trié -->
-               <input type="hidden" name="itemstatus" value="2"/><!-- New -->
-               <input type="hidden" name="assigned_to" value="0"/><!-- No one -->
-               <input type="hidden" name="operating_system" value="1"/><!-- All -->
-               <input type="hidden" name="task_severity" value="2"/><!-- Low -->
-               <input type="hidden" name="task_priority" value="2"/><!-- Normal -->
-               <input type="hidden" name="productversion" value=""/><!-- ??? -->
-               <input type="hidden" name="closedbyversion" value=""/><!-- Undecided -->
-               <input type="hidden" name="due_date" value=""/>
-               <textarea name="detailed_desc" id="flyspray_detail" cols="70" rows="10">
-
-** Explique ici le problème ou l'amélioration proposée **
-               
-Page : {#globals.baseurl#}/?{$smarty.server.QUERY_STRING}
-Navigateur : {$smarty.server.HTTP_USER_AGENT}
-Skin : {$smarty.session.skin} 
-Signalé par {$smarty.session.forlife}</textarea>
-               <div id="flyspray_submit">
-                       <input type="button" value="Fermer" onclick="close_bug(this.form,false)"/>
-                       <input type="button" value="Signaler le bug" onclick="close_bug(this.form,true)"/>
-               </div>
-       </div>
-</form>
-</div>
-
 <div>
   Plat/al <a href="changelog">{#globals.version#}</a> - Copyright © 1999-2006 <a href="http://x-org.polytechnique.org/">Polytechnique.org</a>
   &nbsp;-&nbsp;

diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl
index 162357e..26a9db8 100644 (file)
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -36,7 +36,6 @@
     <link rel="bookmark" href="http://www.polytechnique.org/"       title="| Polytechnique.org" />
     <link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
 
-               <link rel="stylesheet" type="text/css" href="css/flyspray.css" />
     {foreach from=$xorg_css item=css}
     <link rel="stylesheet" type="text/css" href="{$css}" />
     {/foreach}
@@ -47,9 +46,6 @@
     <script type="text/javascript" src="javascript/md5.js"></script>
     <script type="text/javascript" src="javascript/sha1.js"></script>
     <script type="text/javascript" src="javascript/secure_hash.js"></script>
-    {if $smarty.session.auth}
-    <script type="text/javascript" src="javascript/flyspray.js"></script>
-    {/if}
 
     {if $xorg_rss}
     <link rel="alternate" type="application/rss+xml" title="{$xorg_rss.title}" href="{$xorg_rss.href}" />

diff --git a/templates/skin/common.menu.tpl b/templates/skin/common.menu.tpl
index 789cd94..c6b3861 100644 (file)
--- a/templates/skin/common.menu.tpl
+++ b/templates/skin/common.menu.tpl
@@ -74,6 +74,7 @@
 <div class="menu_item"><a href="Docs/NousContacter">Nous contacter</a></div>
 <div class="menu_item"><a href="Docs/Emploi">Carrières</a></div>
 <div class="menu_item"><a href="send_bug" onclick="send_bug();return false">Signaler un bug</a></div>
+{include file=skin/common.bug.tpl}
 
 {if $smarty.session.perms eq admin}
 <div class="menu_title">***</div>