Close #651: less confusing "next tip" link

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

diff --git a/ChangeLog b/ChangeLog
index 93ad4e4..12e57b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,9 @@ Bug/Wish:
     * Emails:
         - #595: Update antispam description                                -FRU
 
+    * Events:
+        - #651: Less confusing "next tip" link                             -FRU
+
     * Newsletter:
         - #648: Add navigation link in preview page                        -FRU
         - #649: Fix layout of preview page                                 -FRU

diff --git a/templates/include/tips.tpl b/templates/include/tips.tpl
index 27b2ccf..b1867bc 100644 (file)
--- a/templates/include/tips.tpl
+++ b/templates/include/tips.tpl
@@ -29,15 +29,17 @@
   {else}
     <span style="color: red; font-weight: bold;">{$tips.titre}</span>
   {/if}
-  {if !$nochange}
-  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="" onclick="Ajax.update_html('tod', 'ajax/tips/{$tips.id}'); return false">
-    {icon name=resultset_next title="Astuce suivante"}
-  </a>
-  {/if}
   </legend>
   {tidy}
   {$tips.text|nl2br|smarty:nodefaults}
-  {/tidy} 
+  {/tidy}
+  {if !$nochange}
+  <div class="right">
+    <a href="" onclick="Ajax.update_html('tod', 'ajax/tips/{$tips.id}'); return false" style="text-decoration: none">
+      Astuce suivante {icon name=resultset_next title="Astuce suivante"}
+    </a>
+  </div>
+  {/if}
 {if $full}
 </fieldset>
 {/if}

diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl
index 438d7b9..2a49a73 100644 (file)
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -46,10 +46,10 @@
     </style>
     {/foreach}
     <link rel="stylesheet" type="text/css" href="css/print.css" media="print"/>
-    <script type="text/javascript">
+    <script type="text/javascript">//<![CDATA[
     if (window.top != window)
       document.write('<link rel="stylesheet" type="text/css" href="css/onlycontent.css" media="all"/>');
-    </script>
+    //]]></script>
     {foreach from=$xorg_js item=js}
     <script type="text/javascript" src="javascript/{$js}"></script>
     {/foreach}