Static Ubuntu-fr

Merge lp:~olivier.fraysse/ubuntu-fr-static/ubuntu-fr-static into lp:ubuntu-fr-static

  1. ubuntu-fr-static
  2. Merge into trunk
Proposed by olive
Status: Merged
Merged at revision: 47
Proposed branch: lp:~olivier.fraysse/ubuntu-fr-static/ubuntu-fr-static
Merge into: lp:ubuntu-fr-static
Diff against target: 168 lines (+25/-39)
1 file modified
start/index.html (+25/-39)
To merge this branch: bzr merge lp:~olivier.fraysse/ubuntu-fr-static/ubuntu-fr-static
Reviewer Review Type Date Requested Status
olive Approve
Review via email: mp+103992@code.launchpad.net

Description of the change

- remplacement de moostik par piwik, pour les stats.
- simplification du HTML et de la CSS
- correction bug CSS apparu en 12.04
- rappatriement de l'image sprite pour évider de nouveaux bugs

To post a comment you must log in.
Revision history for this message
olive (olivier.fraysse) wrote :

j'approuve mon travaille :)

(urgent, surtout pour le bug CSS)

review: Approve
lp:~olivier.fraysse/ubuntu-fr-static/ubuntu-fr-static updated
47. By olive

merge

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'start/index.html'
--- start/index.html 2011-11-22 14:46:47 +0000
+++ start/index.html 2012-04-28 18:46:18 +0000
@@ -3,9 +3,6 @@
3<head>3<head>
44
5<meta http-equiv="content-type" content="text/html; charset=UTF-8" />5<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
6<script type="text/javascript"
7src="http://m3.moostik.net/js/?pseudo=ubuntustart&amp;cpt=ntu&amp;option=invisible">
8</script>
9 6
10<title>Ubuntu - Page de démarrage</title>7<title>Ubuntu - Page de démarrage</title>
11<script type="text/javascript">8<script type="text/javascript">
@@ -32,6 +29,13 @@
32 margin: 0 auto;29 margin: 0 auto;
33 }30 }
3431
32#search-box #ubuntu-branding,
33#search-box .center h1.logo a,
34#help-link,
35#shop-link,
36#community-link {
37 background: url(sprite.png) no-repeat;
38}
35ul#top-nav {39ul#top-nav {
36 margin-top: 5px;40 margin-top: 5px;
37 padding-bottom: 5px;41 padding-bottom: 5px;
@@ -54,28 +58,20 @@
54 margin-top: 63px;58 margin-top: 63px;
55 }59 }
56#search-box #ubuntu-branding {60#search-box #ubuntu-branding {
57 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
58 background-position: 0px -251px;61 background-position: 0px -251px;
59 background-color: #aea79f;62 background-color: #aea79f;
60 height: 40px;63 height: 40px;
61 -moz-border-radius: 0 0 5px 5px;64 -moz-border-radius: 0 0 5px 5px;
62 -webkit-border-radius: 0 0 5px 5px;65 -webkit-border-radius: 0 0 5px 5px;
63}66}
64#search-box .top {
65 width: 593px;
66 height: 65px;
67 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
68 background-position: -10px -10px;
69 margin: 0;
70 padding: 0;
71 }
7267
73#search-box .center {68#search-box .center {
74 width: 595px;69 padding: 62px 44px 96px 44px;
70 width: 505px;
75 margin: 0;71 margin: 0;
76 padding: 0;
77 margin-right: -2px;72 margin-right: -2px;
78 background: url(http://start.ubuntu.com/10.04/middle.png) repeat-y;73 border:1px solid #eee;
74 border-radius:5px;
79 }75 }
8076
81#search-box .center h1 {77#search-box .center h1 {
@@ -83,21 +79,15 @@
83 padding: 0;79 padding: 0;
84 }80 }
8581
86#search-box .center .padding {
87 padding-right: 44px;
88 padding-left: 44px;
89 }
90
91#search-box .center h1.logo a {82#search-box .center h1.logo a {
92 font-size: 1px;83 font-size: 1px;
93 display: block;84 display: block;
94 text-indent: -9999px;85 text-indent: -9999px;
95 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
96 background-position: -10px -310px;86 background-position: -10px -310px;
97 margin: 0;87 margin: 0;
98 padding: 0;88 padding: 0;
99 height: 37px;89 height: 39px;
100 width: 101px;90 width: 112px;
101 margin-bottom: 15px;91 margin-bottom: 15px;
102 position: relative;92 position: relative;
103 }93 }
@@ -115,12 +105,6 @@
115 padding: 2px;105 padding: 2px;
116 }106 }
117107
118#search-box .bottom {
119 width: 593px;
120 height: 98px;
121 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
122 background-position: -10px -133px;
123 }
124#external-links {108#external-links {
125 overflow: auto;109 overflow: auto;
126 width: 605px;110 width: 605px;
@@ -146,27 +130,21 @@
146 color: #e24912;130 color: #e24912;
147}131}
148#help-link {132#help-link {
149 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
150 background-position: -10px -450px;133 background-position: -10px -450px;
151}134}
152#help-link:hover {135#help-link:hover {
153 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
154 background-position: -10px -490px;136 background-position: -10px -490px;
155}137}
156#shop-link {138#shop-link {
157 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
158 background-position: -10px -365px;139 background-position: -10px -365px;
159}140}
160#shop-link:hover {141#shop-link:hover {
161 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
162 background-position: -10px -407px;142 background-position: -10px -407px;
163}143}
164#community-link {144#community-link {
165 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
166 background-position: -10px -530px;145 background-position: -10px -530px;
167}146}
168#community-link:hover {147#community-link:hover {
169 background: url(http://start.ubuntu.com/10.04/sprite.png) no-repeat;
170 background-position: -10px -570px;148 background-position: -10px -570px;
171}149}
172</style>150</style>
@@ -175,10 +153,8 @@
175 <div id="search-box">153 <div id="search-box">
176154
177 <div id="ubuntu-branding"></div>155 <div id="ubuntu-branding"></div>
178 <div class="top"></div>
179156
180 <div class="center">157 <div class="center">
181 <div class="padding">
182 <h1 class="logo"><a href="http://www.google.com">&nbsp;</a></h1>158 <h1 class="logo"><a href="http://www.google.com">&nbsp;</a></h1>
183 <form method="get" action="http://www.google.com/cse" name="search">159 <form method="get" action="http://www.google.com/cse" name="search">
184 <input type="hidden" name="cx" value="partner-pub-9300639326172081:d9bbzbtli15" />160 <input type="hidden" name="cx" value="partner-pub-9300639326172081:d9bbzbtli15" />
@@ -189,9 +165,7 @@
189 <button>Rechercher</button>165 <button>Rechercher</button>
190166
191 </form>167 </form>
192 </div>
193 </div>168 </div>
194 <div class="bottom"></div>
195 <div id="external-links">169 <div id="external-links">
196170
197 <div id="help-link" class="bottom-links"><a href="http://doc.ubuntu-fr.org">Documentation Ubuntu-fr &gt;</a></div>171 <div id="help-link" class="bottom-links"><a href="http://doc.ubuntu-fr.org">Documentation Ubuntu-fr &gt;</a></div>
@@ -205,6 +179,18 @@
205focus_search();179focus_search();
206//]]>180//]]>
207</script>181</script>
182<!-- Piwik -->
183<script type="text/javascript">
184var pkBaseURL = (("https:" == document.location.protocol) ? "https://piwik.infra.ubuntu-fr.org/" : "http://piwik.infra.ubuntu-fr.org/");
185document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
186</script><script type="text/javascript">
187try {
188var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 3);
189piwikTracker.trackPageView();
190piwikTracker.enableLinkTracking();
191} catch( err ) {}
192</script><noscript><p><img src="http://piwik.infra.ubuntu-fr.org/piwik.php?idsite=3" style="border:0" alt="" /></p></noscript>
193<!-- End Piwik Tracking Code -->
208</body>194</body>
209195
210</html>196</html>
211197
=== added file 'start/sprite.png'
212Binary files start/sprite.png 1970-01-01 00:00:00 +0000 and start/sprite.png 2012-04-28 18:46:18 +0000 differ198Binary files start/sprite.png 1970-01-01 00:00:00 +0000 and start/sprite.png 2012-04-28 18:46:18 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: