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

Proposed by olive on 2012-04-28
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 on 2012-04-28
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.
olive (olivier.fraysse) wrote :

j'approuve mon travaille :)

(urgent, surtout pour le bug CSS)

review: Approve
47. By olive on 2012-04-28

merge

Preview Diff

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