Skip to content

Commit 28ec7d2

Browse files
vincent-zurczakvincent-zurczak
committed
Various fixes related to the UI.
Simplify the CSS. Fix it for IE. Simplify some templates. Fix the HTML validity. Add Petals 4.1.0 on the web site.
1 parent 1ece7be commit 28ec7d2

File tree

11 files changed

+227
-352
lines changed

11 files changed

+227
-352
lines changed

‎_includes/footer.html

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
<div id="footer">
2-
3-
<ul id="subnavlist">
4-
<li><a href="http://www.petalslink.com" title="Petals Link, publisher of Petals ESB">Petals Link</a></li>
5-
<li><a href="http://petals.ow2.org" title="Petals community website">Petals Community</a></li>
6-
<li><a href="http://forum.petalslink.com/" title="Petals community forum">Forum</a></li>
7-
<li><a href="http://ow2.org/" title="OW2 Consortium website">OW2</a></li>
8-
<li><a href="{{ site.url }}legal.html" title="Legal notices">Legal</a></li>
9-
<li><a href="http://www.petalslink.com/en/contact" title="contact">Contact</a></li>
10-
</ul>
2+
<a href="http://www.petalslink.com" title="Petals Link, publisher of Petals ESB">Petals Link</a>
3+
<a href="http://petals.ow2.org" title="Petals community website">Petals Community</a>
4+
<a href="http://forum.petalslink.com/" title="Petals community forum">Forum</a>
5+
<a href="http://ow2.org/" title="OW2 Consortium website">OW2</a>
6+
<a href="{{ site.url }}legal.html" title="Legal notices">Legal</a>
7+
<a href="http://www.petalslink.com/en/contact" title="contact" class="last-link">Contact</a>
118
</div>

‎_includes/galaxy.html

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<div id="galaxy">
2-
<ul>
3-
<li><a id="www" href="http://www.petalslink.com/">Petalslink</a></li>
4-
<li><a id="petals" href="http://petals.ow2.org/">Community</a></li>
5-
<li><a id="forum" href="http://forum.petalslink.com/">Forum</a></li>
6-
<li><a id="download" href="http://download.petalslink.com/">Download</a></li>
7-
<li><a id="doc" href="http://doc.petalslink.com/">Documentation</a></li>
8-
<li><a id="planet" href="http://planet.petalslink.com/">Blogs</a></li>
9-
</ul>
2+
<a id="www" href="http://www.petalslink.com/">Petalslink</a>
3+
<a id="petals" href="http://petals.ow2.org/">Community</a>
4+
<a id="forum" href="http://forum.petalslink.com/">Forum</a>
5+
<a id="download" href="http://download.petalslink.com/">Download</a>
6+
<a id="doc" href="http://doc.petalslink.com/">Documentation</a>
7+
<a id="planet" href="http://planet.petalslink.com/">Blogs</a>
108
</div>

‎_includes/menus.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div id="menus">
22
<div id="banner">
3-
<a href="{{ site.url }}index.html"><img src="http://files.petalslink.com/img/community/petals_community_2.0.png"></a>
3+
<a href="{{ site.url }}index.html"><img src="http://files.petalslink.com/img/community/petals_community_2.0.png" alt="Petals ESB" /></a>
44
</div>
55

66
<ul id="nav">

‎_layouts/standard.html

Lines changed: 43 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,3 @@
1-
<!-- v7 - 2012-06-21 - Allègement temporaire des blocs tweets et blogs en attendant de gérer mieux.-->
2-
<!-- JEKYLL v1 - 2012-06-21 - Copie de la v7 de structure-nouveau-site.html, avec adaptation des appels de jquery, et appel du css depuis files.petalslink.com -->
3-
<!-- JEKYLL v2 - 2012-06-21 - On sort les parties de la structure pour les mettre dans des includes : galaxy, menus, footer. -->
4-
<!-- JEKYLL v4 - 2012-06-22 - Intégration des modifs de Vincent pour régler le problème du JS. -->
5-
<!-- JEKYLL v5 - 2012-06-25 - Appel du js rssfeed depuis files.petalslink.com. Ajout de Google Analytics -->
6-
<!-- JEKYLL v6 - 2012-06-26 - Correction du double appel de fichier css -->
7-
8-
91
<!DOCTYPE html>
102
<html lang="en">
113
<head>
@@ -15,62 +7,64 @@
157
<meta name="author" content=""><!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script> <![endif]--><!--//-->
168

179
<link type="text/css" rel="stylesheet" media="all" href="community-all.css" />
18-
1910
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.0/jquery.min.js" type="text/javascript"></script>
2011
<script src="http://files.petalslink.com/js/rss/jquery.zrssfeed.min.js" type="text/javascript"></script>
21-
2212
<script src="http://files.petalslink.com/js/analytics/ga-petalslink.js" type="text/javascript"></script>
23-
24-
2513
</head>
14+
2615
<body>
2716
{% include galaxy.html %}
2817

2918
{% include menus.html %}
3019

3120
<div id="wrapper">
32-
<div id="content">
33-
<h1 class="title">{{page.title}}</h1>
34-
{{content}}
35-
</div>
36-
37-
<div id="sidebar">
38-
<div>
39-
<h2>Tweets</h2>
40-
<div id="tweets"></div>
41-
</div>
42-
<div class="block">
43-
<h2>Articles</h2>
44-
<div id="blog"></div>
45-
</div>
21+
<div id="content">
22+
<h1 class="title">{{page.title}}</h1>
23+
{{content}}
24+
</div>
4625

47-
<div>
48-
{% include social-links.html %}
49-
</div>
26+
<div id="sidebar">
27+
{% if page.show-dl-in-menu %}
28+
<div id="download-button">
29+
<a xmlns="http://www.w3.org/1999/xhtml" onclick="javascript:urchinTracker('/downloads/petals-esb-distrib-4.0');" href="http://download.petalslink.com/petals-esb/petals-esb-distrib-4.0.zip">
30+
<img title="Download Petals ESB" alt="Click to download Petals ESB" src="http://files.petalslink.com/img/site_download/download_petals-esb.png"/>
31+
</a>
32+
</div>
33+
{% endif %}
34+
<div>
35+
<h2>Tweets</h2>
36+
<div id="tweets"></div>
37+
</div>
38+
<div class="block">
39+
<h2>Articles</h2>
40+
<div id="blog"></div>
41+
</div>
5042

51-
</div>
43+
<div>
44+
{% include social-links.html %}
45+
</div>
46+
</div>
5247
</div>
5348

5449
{% include footer.html %}
5550

56-
<script language="javascript">
57-
function setActive() {
58-
var fullHost = window.location.host.split('.')
59-
//window.location.host is subdomain.domain.com
60-
var sub = fullHost[0]
61-
var btn = document.getElementById(sub);
62-
btn.parentNode.className= "active";
63-
}
64-
</script>
65-
<script>document.onload = setActive()</script>
66-
</body>
67-
68-
<script type="text/javascript">
69-
jQuery.noConflict();
70-
jQuery(document).ready(function () {  
71-
jQuery('#blog').rssfeed('http://feeds.feedburner.com/PetalsPlanet?format=xml', {limit: 3, header:false, date:false, snippet: false, content: false, media:false,});
72-
jQuery('#tweets').rssfeed('http://api.twitter.com/1/statuses/user_timeline.rss?screen_name=petalslink', {limit: 3, header:false, date:false, snippet: false, content: false, media:false,});
73-
});
74-
</script>
51+
<script language="javascript">
52+
function setActive() {
53+
var fullHost = window.location.host.split('.')
54+
//window.location.host is subdomain.domain.com
55+
var sub = fullHost[0]
56+
var btn = document.getElementById(sub);
57+
btn.parentNode.className= "active";
58+
}
59+
</script>
60+
<script>document.onload = setActive()</script>
7561

62+
<script type="text/javascript">
63+
jQuery.noConflict();
64+
jQuery(document).ready(function () {  
65+
jQuery('#blog').rssfeed('http://feeds.feedburner.com/PetalsPlanet?format=xml', {limit: 3, header:false, date:false, snippet: false, content: false, media:false,});
66+
jQuery('#tweets').rssfeed('http://api.twitter.com/1/statuses/user_timeline.rss?screen_name=petalslink', {limit: 3, header:false, date:false, snippet: false, content: false, media:false,});
67+
});
68+
</script>
69+
</body>
7670
</html>

‎committers.md

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -7,73 +7,44 @@ title: "Committers"
77
*Active committers on Petals ESB and related projects.*
88

99
* Christophe Deneux (Linagora) - [@chrisdeneux](https://twitter.com/ChrisDENEUX)
10-
1110
* Christophe Hamerling (Linagora) - [@chamerling](https://twitter.com/chamerling) - [Blog](http://chamerling.org)
12-
1311
* Julien Lesbesguieres (Linagora) - [@jlesbegueries](https://twitter.com/jlesbegueries)
14-
1512
* Marie Sauvage (Linagora)
16-
1713
* Nicolas Salatgé (Linagora)
18-
1914
* Pierre-Yves Gibello (Linagora) - [Blog](http://planet.petalslink.com/home/pygibello/)
20-
2115
* Vincent Zurczak (Linagora) - [@vincentzurczak](https://twitter.com/VincentZurczak) - [Blog (EN)](http://vzurczak.wordpress.com) - [Blog (FR)](http://vzurczak2.wordpress.com)
2216

2317
# Former Committers
2418

2519
*People who were actively involved in the Petals project.*
2620

2721
* Adrien Louis (Petals Link)
28-
2922
* Adrien Ruffie (Petals Link)
30-
3123
* Anne-Marie Barthe (Petals Link)
32-
3324
* Charles Casadei (Petals Link)
34-
3525
* Frédéric Gardes (Petals Link)
36-
3726
* Gaël Blondelle (Petals Link)
38-
3927
* Marc Jambert (Petals Link)
40-
4128
* Mathias Beldame (Petals Link)
42-
4329
* Mathieu Carrolle (Petals Link)
44-
4530
* Maxime Carpentier (Petals Link)
46-
4731
* Mickaël Istria (Petals Link)
48-
4932
* Mohammed El Jai (Petals Link)
50-
5133
* Nicolas Oddoux (Petals Link)
52-
5334
* Olivier Fabre (Petals Link)
54-
5535
* Patrice Conil (Petals Link)
56-
5736
* Roland Naudin (Petals Link)
58-
5937
* Sandra Trino (Petals Link)
60-
6138
* Sébastien André (Petals Link)
62-
6339
* Thierry Déjean (Petals Link)
6440

6541
# Contributors
6642

6743
*People who contributed to the Petals project.*
6844

6945
* Cédric Girodengo (Cap Gemini Sud)
70-
7146
* Guillaume Decarnin (Open Wide)
72-
7347
* Hervé Gérard (Sopra)
74-
7548
* Marc Dutoo (Open Wide)
76-
7749
* Nicolas Dolet (INRIA)
78-
7950
* Philippe Merle (INRIA)

0 commit comments

Comments
 (0)