Reworked css include/pref/tooltip/accesskey subsystem

[lhc/web/wiklou.git] / templates / xhtml_slim.pt

diff --git a/templates/xhtml_slim.pt b/templates/xhtml_slim.pt
index b1ad90f..f5dac63 100644 (file)
--- a/templates/xhtml_slim.pt
+++ b/templates/xhtml_slim.pt
@@ -5,15 +5,13 @@
     <meta http-equiv="Content-Type" content="${mimetype}; charset=${charset}" />
     ${headlinks}
     <title tal:content="pagetitle">Exciting xhtml slimfast</title>
-    <style type="text/css" media="screen">/*<![CDATA[*/ @import "${stylepath}/${skinname}/main.css"; /*]]>*/</style>
-    <style type="text/css" media="projection">/*<![CDATA[*/ @import "${stylepath}/${skinname}/main.css"; /*]]>*/</style>
+    <style type="text/css" media="screen,projection">/*<![CDATA[*/ @import "${stylepath}/${skinname}/main.css"; /*]]>*/</style>
     <link rel="stylesheet" type="text/css" media="print" href="${stylepath}/commonPrint.css" />
     <!--[if IE]><style type="text/css" media="all">@import "${stylepath}/${skinname}/IEFixes.css";</style>
     <script type="text/javascript" src="${stylepath}/IEFixes.js"></script>
     <meta http-equiv="imagetoolbar" content="no" /><![endif]-->
+    <script type="text/javascript" tal:attributes="src jsvarurl"></script>
     <script type="text/javascript" src="${stylepath}/wikibits.js"></script>
-    <script type="text/javascript"> /*<![CDATA[*/ if(addcss){addcss('${stylepath}/${skinname}/');} /*]]>*/</script>
-    <style tal:condition="rtl" type="text/css">/*<![CDATA[*/@import "${stylepath}/${skinname}/rtl.css";/*]]>*/</style>
     <style tal:condition="usercss" type="text/css">/*<![CDATA[*/ ${usercss} /*]]>*/</style>
     <script tal:condition="userjs" type="text/javascript" tal:attributes="src userjs"></script><script 
       tal:condition="userjsprev" type="text/javascript">/*<![CDATA[*/${userjsprev}/*]]>*/</script>
@@ -54,7 +52,7 @@
          <ul>
            <li tal:repeat="action content_actions" 
            tal:attributes="id string:ca-${repeat/action/key}; class action/class|default"><a
-             tal:attributes="title action/ttip|default;accesskey action/akey|default;href action/href|default"
+             tal:attributes="href action/href|default"
              tal:content="action/text">Linktext</a></li>
          </ul>
        </div>
@@ -65,7 +63,7 @@
            <ul>
              <li tal:repeat="item personal_urls" 
              tal:attributes="id string:pt-${repeat/item/key};"><a href="myuserpage"
-               tal:attributes="href item/href; accesskey item/akey|default; title item/ttip|default; class item/class|default"
+               tal:attributes="href item/href; class item/class|default"
                tal:content="item/text">Log in</a></li>
            </ul>
          </div>
@@ -78,26 +76,19 @@
          <h5 i18n:translate="string:navigation">Navigation</h5>
          <div class="pBody">
            <ul>
-             <li><a href="${nav_urls/mainpage/href}"
-               i18n:attributes="accesskey string:accesskey-mainpage | default; title string:tooltip-mainpage"
+             <li id="n-mainpage"><a href="${nav_urls/mainpage/href}"
                i18n:translate="string:mainpage">Main Page</a></li>
-             <li tal:condition="nav_urls/portal/href"><a href="${nav_urls/portal/href}"
-               i18n:attributes="accesskey string:accesskey-portal | default; title string:tooltip-portal|default"
+             <li id="n-portal" tal:condition="nav_urls/portal/href"><a href="${nav_urls/portal/href}"
                i18n:translate="string:portal">Community Portal</a></li>
-             <li tal:condition="nav_urls/currentevents/href"><a href="${nav_urls/currentevents/href}"
-               i18n:attributes="title string:tooltip-currentevents|default" 
+             <li id="n-currentevents" tal:condition="nav_urls/currentevents/href"><a href="${nav_urls/currentevents/href}"
                i18n:translate="string:currentevents">Current Events</a></li>
-             <li><a href="${nav_urls/recentchanges/href}"
-               i18n:attributes="accesskey string:accesskey-recentchanges|default; title string:tooltip-recentchanges|default" 
+             <li id="n-recentchanges"><a href="${nav_urls/recentchanges/href}"
                i18n:translate="string:recentchanges">Recent Changes</a></li>
-             <li><a href="${nav_urls/randompage/href}"
-               i18n:attributes="accesskey string:accesskey-randompage | default; title string:tooltip-randompage" 
+             <li id="n-randompage"><a href="${nav_urls/randompage/href}"
                i18n:translate="string:randompage">Random Page</a></li>
-             <li><a href="${nav_urls/help/href}"
-               i18n:attributes="title string:tooltip-help|default" 
+             <li id="n-help"><a href="${nav_urls/help/href}"
                i18n:translate="string:help">Help</a></li>
-             <li tal:condition="nav_urls/sitesupport/href"><a href="${nav_urls/sitesupport/href}"
-               i18n:attributes="title string:tooltip-sitesupport|default" 
+             <li id="n-sitesupport" tal:condition="nav_urls/sitesupport/href"><a href="${nav_urls/sitesupport/href}"
                i18n:translate="string:sitesupport">Donations</a></li>
            </ul>
          </div>
@@ -120,30 +111,24 @@
          <h5 i18n:translate="string:toolbox">Toolbox</h5>
          <div class="pBody">
            <ul>
-             <li><a href="${nav_urls/whatlinkshere/href}"
-               i18n:attributes="accesskey string:accesskey-whatlinkshere|default; title string:tooltip-whatlinkshere|default" 
+             <li id="t-whatlinkshere"><a href="${nav_urls/whatlinkshere/href}"
                i18n:translate="string:whatlinkshere">What links here</a></li>
-             <li><a href="${nav_urls/recentchangeslinked/href}"
-               i18n:attributes="accesskey string:accesskey-recentchangeslinked|default;title string:tooltip-recentchangeslinked | default"
+             <li id="t-recentchangeslinked"><a href="${nav_urls/recentchangeslinked/href}"
                i18n:translate="string:recentchangeslinked">Related Changes</a></li>
              <li tal:condition="feeds" id="feedlinks">
              <span i18n:translate="string:feedlinks">Feeds:</span>
              <span tal:repeat="feed feeds" 
                tal:attributes="id string:feed-${repeat/feed/key};"><a 
-                 tal:attributes="href feed/href; title feed/ttip|default"
+                 tal:attributes="href feed/href;"
                  tal:content="feed/text">rss</a>&nbsp;</span>
              </li>
-             <li tal:condition="nav_urls/contributions/href"><a href="${nav_urls/contributions/href}"
-               i18n:attributes="accesskey string:accesskey-contributions|default; title string:tooltip-contributions|default" 
+             <li id="t-contributions" tal:condition="nav_urls/contributions/href"><a href="${nav_urls/contributions/href}"
                i18n:translate="string:contributions">Contributions</a></li>
-             <li tal:condition="nav_urls/emailuser/href"><a href="${nav_urls/emailuser/href}"
-               i18n:attributes="accesskey string:accesskey-emailuser|default; title string:tooltip-emailuser|default" 
+             <li id="t-emailuser" tal:condition="nav_urls/emailuser/href"><a href="${nav_urls/emailuser/href}"
                i18n:translate="string:emailuser">Email this user</a></li>
-             <li tal:condition="loggedin"><a href="${nav_urls/upload/href}"
-               i18n:attributes="accesskey string:accesskey-upload|default; title string:tooltip-upload|default" 
+             <li id="t-upload" tal:condition="loggedin"><a href="${nav_urls/upload/href}"
                i18n:translate="string:upload">Upload a file</a></li>
-             <li><a href="${nav_urls/specialpages/href}"
-               i18n:attributes="accesskey string:accesskey-specialpages|default;title string:tooltip-specialpages|default"
+             <li id="t-specialpages"><a href="${nav_urls/specialpages/href}"
                i18n:translate="string:specialpages">Special Pages</a></li>
            </ul>
          </div>