| Index: trunk/phase3/templates/xhtml_slim.pt |
| — | — | @@ -9,22 +9,14 @@ |
| 10 | 10 | <style type="text/css" media="screen"> |
| 11 | 11 | /*<![CDATA[*/ |
| 12 | 12 | @import url(${stylepath}/${skinname}/main.css); |
| | 13 | + /* custom css, could be either a pref or a subpage of the the user page */ |
| | 14 | + /* @import url(${stylepath}/custom.css); */ |
| 13 | 15 | /*]]>*/ |
| 14 | 16 | </style> |
| 15 | | - <!-- Custom style sheet if available, could either be a pref or a subpage of the user page |
| 16 | | - <style type="text/css" media="all"> |
| 17 | | - /*<![CDATA[*/ |
| 18 | | - @import url(${stylepath}/custom.css); |
| 19 | | - /*]]>*/ |
| 20 | | - </style>--> |
| 21 | | - <!-- Style sheet used for printing --> |
| 22 | 17 | <link rel="stylesheet" type="text/css" media="print" href="${stylepath}/commonPrint.css" /> |
| 23 | | - <!-- insane fixes as usual --><!--[if IE]> |
| 24 | | - <style type="text/css" media="all">@import url(${stylepath}/${skinname}/IEFixes.css);</style> |
| 25 | | - <![endif]--> |
| | 18 | + <!--[if IE]><style type="text/css" media="all">@import url(${stylepath}/${skinname}/IEFixes.css);</style><![endif]--> |
| 26 | 19 | <link tal:condition="favicon" rel="shortcut icon" href="${favicon}" type="image/x-icon" /> |
| 27 | | - <!-- Disable IE6 image toolbar --> |
| 28 | | - <meta http-equiv="imagetoolbar" content="no" /> |
| | 20 | + <!-- Disable IE6 image toolbar --><meta http-equiv="imagetoolbar" content="no" /> |
| 29 | 21 | <script type="text/javascript" src="${stylepath}/wikibits.js"> |
| 30 | 22 | </script> |
| 31 | 23 | </head> |
| — | — | @@ -35,24 +27,22 @@ |
| 36 | 28 | <div id="portal-column-content"> |
| 37 | 29 | <div id="content"> |
| 38 | 30 | <a name="top" id="contentTop"></a> |
| 39 | | - <div class="documentContent"> |
| | 31 | + <div id="documentContent"> |
| 40 | 32 | |
| 41 | 33 | <h1 class="documentFirstHeading" tal:content="title">Leonardo da Vinci</h1> |
| 42 | 34 | |
| 43 | | - <div id="bodyContent" class="plain"> |
| | 35 | + <div id="bodyContent"> |
| 44 | 36 | <h3 id="siteSubtitle" i18n:translate="string:fromwikipedia">From Wikipedia, the free encyclopedia.</h3> |
| 45 | 37 | <div tal:condition="subtitle" id="documentSubtitle" tal:content="structure subtitle"></div> |
| 46 | 38 | <!-- <esi:include src="userxy/message"/> cached per user, purged on new message--> |
| 47 | 39 | <div tal:condition="newtalk" class="portalMessage" tal:content="newtalk"></div> |
| 48 | 40 | <!-- the content area is cached with the remaining inexpensive sceleton, one version for all. |
| 49 | | - The edit links and right-click section stuff is attached from js --> |
| | 41 | + The edit links and right-click section stuff can be attached from js --> |
| 50 | 42 | <!-- start content --> |
| 51 | 43 | |
| 52 | 44 | ${bodytext} |
| 53 | 45 | |
| 54 | 46 | <!-- end content --> |
| 55 | | - <div class="documentByLine"> |
| 56 | | - </div> |
| 57 | 47 | </div> |
| 58 | 48 | </div> |
| 59 | 49 | </div> |
| — | — | @@ -63,20 +53,17 @@ |
| 64 | 54 | <!--<esi:include src="thisurl?esiview=contentviews&watch=0&priv=sysop"/> tricky to purge because of the many different versions, |
| 65 | 55 | might not be worth it for non-anons --> |
| 66 | 56 | <div id="portlet-contentViews" class="portlet"> |
| 67 | | - <h5 class="hiddenStructure">Views</h5> |
| 68 | | - |
| 69 | | - <ul class="contentViews"> |
| | 57 | + <h5>Views</h5> |
| | 58 | + <ul> |
| 70 | 59 | <li tal:repeat="action content_actions" |
| 71 | 60 | tal:attributes="id string:contentaction-${repeat/action/key}; class action/class|default"><a |
| 72 | 61 | tal:attributes="title action/ttip|default; accesskey action/akey|default;href action/href|default" |
| 73 | 62 | tal:content="action/text">Linktext</a></li> |
| 74 | 63 | </ul> |
| 75 | | - |
| 76 | 64 | </div> |
| 77 | 65 | <!--<esi:include src="userxy?personaltools"/> cached per user, just rendered once per session --> |
| 78 | 66 | <div class="portlet" id="portlet-personal"> |
| 79 | | - <h5 class="hiddenStructure" i18n:translate="string:personaltools">Personal Tools</h5> |
| 80 | | - |
| | 67 | + <h5 i18n:translate="string:personaltools">Personal Tools</h5> |
| 81 | 68 | <div class="portletBody"> |
| 82 | 69 | <div class="portletContent odd"> |
| 83 | 70 | <ul id="portal-personaltools"> |
| — | — | @@ -92,25 +79,20 @@ |
| 93 | 80 | <div class="portlet" id="portlet-logo"> |
| 94 | 81 | <a href="${nav_urls/mainpage/href}" i18n:attributes="title string:mainpage"></a> |
| 95 | 82 | </div> |
| 96 | | - |
| 97 | | - <div class="portlet" id="portlet-navigation-tree"> |
| | 83 | + <div class="portlet" id="portlet-navigation"> |
| 98 | 84 | <h5 i18n:translate="string:navigation">Navigation</h5> |
| 99 | | - |
| 100 | 85 | <div class="portletBody"> |
| 101 | 86 | <div class="portletContent odd"> |
| 102 | 87 | <ul> |
| 103 | 88 | <li><a href="${nav_urls/mainpage/href}" |
| 104 | 89 | i18n:attributes="accesskey string:accesskey-mainpage | default; title string:tooltip-mainpage" |
| 105 | 90 | i18n:translate="string:mainpage">Main Page</a></li> |
| 106 | | - |
| 107 | 91 | <li><a href="${nav_urls/randompage/href}" |
| 108 | 92 | i18n:attributes="accesskey string:accesskey-randompage | default; title string:tooltip-randompage" |
| 109 | 93 | i18n:translate="string:randompage">Random Page</a></li> |
| 110 | | - |
| 111 | | - <li condition="${nav_urls/currentevents/href}"><a href="${nav_urls/currentevents/href}" |
| | 94 | + <li tal:condition="${nav_urls/currentevents/href}"><a href="${nav_urls/currentevents/href}" |
| 112 | 95 | i18n:attributes="title string:tooltip-currentevents|default" |
| 113 | 96 | i18n:translate="string:currentevents">Current Events</a></li> |
| 114 | | - |
| 115 | 97 | <li><a href="${nav_urls/sitesupport/href}" |
| 116 | 98 | i18n:attributes="title string:tooltip-sitesupport|default" |
| 117 | 99 | i18n:translate="string:sitesupport">Donations</a></li> |
| — | — | @@ -118,16 +100,13 @@ |
| 119 | 101 | </div> |
| 120 | 102 | </div> |
| 121 | 103 | </div> |
| 122 | | - |
| 123 | 104 | <div id="portlet-search" class="portlet"> |
| 124 | 105 | <h5 i18n:translate="string:search">Search</h5> |
| 125 | | - |
| 126 | 106 | <div class="portletBody"> |
| 127 | 107 | <div class="portletContent odd"> |
| 128 | 108 | <form name="searchform" action="${searchaction}" id="searchform"> |
| 129 | 109 | <input id="searchGadget" name="search" type="text" tabindex="30001" |
| 130 | 110 | i18n:attributes="accesskey string:accesskey-search | default"/> |
| 131 | | - |
| 132 | 111 | <input type='submit' name="go" value="Go" class="searchButton" |
| 133 | 112 | i18n:attributes="value string:go"/> <input type='submit' |
| 134 | 113 | value="Search" class="searchButton" |
| — | — | @@ -136,7 +115,6 @@ |
| 137 | 116 | </div> |
| 138 | 117 | </div> |
| 139 | 118 | </div> |
| 140 | | - |
| 141 | 119 | <!--<esi:include src="thisurl?esiview=toolbox&loggedin=0"/> one anon, one logged-in user version per page because of the links --> |
| 142 | 120 | <div class="portlet" id="portlet-toolbox"> |
| 143 | 121 | <h5 i18n:translate="string:toolbox">Toolbox</h5> |
| — | — | @@ -144,31 +122,24 @@ |
| 145 | 123 | <div class="portletBody"> |
| 146 | 124 | <div class="portletContent odd"> |
| 147 | 125 | <ul> |
| 148 | | - |
| 149 | 126 | <li><a href="${nav_urls/help/href}" |
| 150 | 127 | i18n:attributes="title string:tooltip-help|default" |
| 151 | 128 | i18n:translate="string:help">Help</a></li> |
| 152 | | - |
| 153 | 129 | <li><a href="${nav_urls/recentchanges/href}" |
| 154 | 130 | i18n:attributes="accesskey string:accesskey-recentchanges|default; title string:tooltip-recentchanges|default" |
| 155 | 131 | i18n:translate="string:recentchanges">Recent Changes</a></li> |
| 156 | | - |
| 157 | 132 | <li><a href="${nav_urls/recentchangeslinked/href}" |
| 158 | 133 | i18n:attributes="title string:tooltip-recentchangeslinked | default" |
| 159 | 134 | i18n:translate="string:recentchangeslinked">Related Changes</a></li> |
| 160 | | - |
| 161 | 135 | <li><a href="${nav_urls/whatlinkshere/href}" |
| 162 | 136 | i18n:attributes="accesskey string:accesskey-whatlinkshere|default; title string:tooltip-whatlinkshere|default" |
| 163 | 137 | i18n:translate="string:whatlinkshere">What links here</a></li> |
| 164 | | - |
| 165 | 138 | <li><a href="${nav_urls/specialpages/href}" |
| 166 | 139 | i18n:attributes="title string:tooltip-specialpages|default" |
| 167 | 140 | i18n:translate="string:specialpages">Special Pages</a></li> |
| 168 | | - |
| 169 | 141 | <li tal:condition="loggedin"><a href="${nav_urls/upload/href" |
| 170 | 142 | i18n:attributes="accesskey string:accesskey-upload|default; title string:tooltip-upload|default" |
| 171 | 143 | i18n:translate="string:upload">Upload a file</a></li> |
| 172 | | - |
| 173 | 144 | </ul> |
| 174 | 145 | </div> |
| 175 | 146 | </div> |
| — | — | @@ -177,7 +148,6 @@ |
| 178 | 149 | |
| 179 | 150 | <div id="portlet-language" class="portlet" tal:condition="language_urls"> |
| 180 | 151 | <h5 i18n:translate="string:otherlanguages">Language</h5> |
| 181 | | - |
| 182 | 152 | <div class="portletBody"> |
| 183 | 153 | <div class="portletContent odd"> |
| 184 | 154 | <ul> |