Ubuntu Party

Merge lp:~yoboy-leguesh/ubuntu-party/bugfixes into lp:ubuntu-party

  1. bugfixes
  2. Merge into trunk
Proposed by YoBoY
Status: Merged
Merged at revision: 5
Proposed branch: lp:~yoboy-leguesh/ubuntu-party/bugfixes
Merge into: lp:ubuntu-party
Diff against target: 279 lines (+82/-77)
4 files modified
wp-content/themes/ubuntu-party_light/archive.php (+33/-33)
wp-content/themes/ubuntu-party_light/events/events-list-load-widget-display.php (+4/-4)
wp-content/themes/ubuntu-party_light/index.php (+34/-33)
wp-content/themes/ubuntu-party_light/style.css (+11/-7)
To merge this branch: bzr merge lp:~yoboy-leguesh/ubuntu-party/bugfixes
Reviewer Review Type Date Requested Status
Ubuntu Party WebApps Developpers Pending
Review via email: mp+48900@code.launchpad.net

Description of the change

Amélioration de la présentatio du bloc actualité de la page d'accueil
Remplacement des évènements de la page d'accueil par les Actualités
Modification de l'affichage des listes d'articles.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'wp-content/themes/ubuntu-party_light/archive.php'
2--- wp-content/themes/ubuntu-party_light/archive.php 2011-02-03 09:46:16 +0000
3+++ wp-content/themes/ubuntu-party_light/archive.php 2011-02-08 11:02:33 +0000
4@@ -4,48 +4,48 @@
5
6 <?php if (have_posts()) : ?>
7
8- <span class="breadcrumbs"><a href="<?php echo get_option('home'); ?>/">Home</a> &raquo; Archive</span>
9-
10 <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
11
12- <?php /* If this is a category archive */ if (is_category()) { ?><h2 class="title">Articles in the <?php single_cat_title(); ?> Category</h2>
13-
14- <?php /* If this is a tagged archive */ } elseif (is_tag()) { ?> <h2 class="title">Articles tagged with: <?php single_tag_title(); ?></h2>
15-
16- <?php /* If this is a daily archive */ } elseif (is_day()) { ?> <h2 class="title">Articles Archive for <?php the_time('j F Y'); ?></h2>
17-
18- <?php /* If this is a monthly archive */ } elseif (is_month()) { ?><h2 class="title">Articles Archive for <?php the_time('F Y'); ?></h2>
19+ <?php /* If this is a category archive */ if (is_category()) { ?><h2 class="title">Articles de la catégorie <?php single_cat_title(); ?></h2>
20+
21+ <?php /* If this is a tagged archive */ } elseif (is_tag()) { ?> <h2 class="title">Articles ayant l'étiquette <?php single_tag_title(); ?></h2>
22+
23+ <?php /* If this is a daily archive */ } elseif (is_day()) { ?> <h2 class="title">Articles publié le <?php the_time('j F Y'); ?></h2>
24+
25+ <?php /* If this is a monthly archive */ } elseif (is_month()) { ?><h2 class="title">Articles publié en <?php the_time('F Y'); ?></h2>
26
27 <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
28- <h2 class="title">Articles Archive for Year <?php the_time('Y'); ?></h2>
29+ <h2 class="title">Articles de l'année <?php the_time('Y'); ?></h2>
30
31 <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
32- <h2 class="title">The Archives</h2>
33+ <h2 class="title">Articles</h2>
34 <?php } ?>
35
36 <div id="archive">
37-
38- <?php while (have_posts()) : the_post(); ?>
39-
40- <div class="clearfloat">
41- <h3 class=cat_title><?php the_category(', '); ?> &raquo</h3>
42- <div class="title"><a href="<?php the_permalink() ?>" rel="bookmark"><?php the_title(); ?></a></div>
43- <div class="meta">[<?php the_time('j M Y') ?> | <?php comments_popup_link('No Comment', 'One Comment', '% Comments');?> | <?php if(function_exists('the_views')) { the_views(); } ?>]</div>
44-
45- <div class="spoiler">
46- <?php $values = get_post_custom_values("Image");
47- if (isset($values[0])) { ?>
48- <a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title(); ?>">
49- <img src="<?php echo bloginfo('template_url'); ?>/scripts/timthumb.php?src=/<?php
50-$values = get_post_custom_values("Image"); echo $values[0]; ?>&w=150&h=150&zc=1&q=100"
51-alt="<?php the_title(); ?>" class="left" width="150px" height="150px" /></a>
52- <?php } ?>
53-
54- <?php the_excerpt(); ?>
55- </div>
56-
57- </div>
58-
59+ <?php while (have_posts()) : the_post(); ?>
60+ <div class="clearfloat">
61+ <h2 class="title"><a href="<?php the_permalink() ?>" rel="bookmark"><?php the_title(); ?></a></h2>
62+ <div class="meta" style="float:right;">
63+ [publié le <?php the_time('j M Y') ?> | <?php comments_popup_link('Aucuns commentaires', 'Un Commentaire', '% Commentaires');?> <?php if(function_exists('the_views')) { echo " | "; the_views(); } ?>]
64+ </div>
65+ <div class="spoiler">
66+ <?php $values = get_post_custom_values("Image"); ?>
67+ <?php if (isset($values[0])) { ?>
68+ <a href="<?php the_permalink() ?>" rel="bookmark" title="Permalien vers <?php the_title(); ?>">
69+ <img src="<?php echo bloginfo('template_url'); ?>/scripts/timthumb.php?src=/<?php echo $values[0]; ?>&w=130&h=130&zc=1&q=100" alt="<?php the_title(); ?>" class="left" width="130px" />
70+ </a>
71+ <?php } else { ?>
72+ <a href="<?php the_permalink() ?>" rel="bookmark" title="Permalien vers <?php the_title(); ?>">
73+ <img src="<?php echo bloginfo('template_url'); ?>/images/imagenull.png" alt="<?php the_title(); ?>" class="left" width="130px" height="130px" />
74+ </a>
75+ <?php } ?>
76+ <div class="spoiler_text">
77+ <h4 class="meta">catégories : <?php the_category(', '); ?></h4>
78+ <?php the_excerpt(); ?>
79+ </div>
80+ </div>
81+
82+ </div>
83 <?php endwhile; ?>
84
85 <div class="navigation">
86
87=== modified file 'wp-content/themes/ubuntu-party_light/events/events-list-load-widget-display.php'
88--- wp-content/themes/ubuntu-party_light/events/events-list-load-widget-display.php 2011-02-06 22:54:00 +0000
89+++ wp-content/themes/ubuntu-party_light/events/events-list-load-widget-display.php 2011-02-08 11:02:33 +0000
90@@ -30,18 +30,18 @@
91 </a>
92 <?php } ?>
93 <div class="info">
94- <a href="<?php echo get_permalink($post->ID) ?>"><?php echo $post->post_title ?></a>
95+ <h4><a href="<?php echo get_permalink($post->ID) ?>"><?php echo $post->post_title ?></a></h4>
96 <ul class="meta">
97 <?php
98 if ( $start == 'on' && $EventStartDate != '' ) {
99 $time = $startTime == 'on' ? true : false;
100 echo '<li class="Date event_block">'.the_event_start_date( $post->ID, $time )."</li>";
101 }
102- if ( $end == 'on' && $EventEndDate != '' ) {
103+ /*if ( $end == 'on' && $EventEndDate != '' ) {
104 if( $start == 'on' && $EventStartDate != '' ) echo ' au ';
105 $time = $endTime == 'on' ? true : false;
106 echo '<li class="Date event_block">'.the_event_end_date( $post->ID, $time ).'</li>';
107- }
108+ }*/
109 if ( $EventVenue != '') {
110 echo '<li class="Lieu event_block">'.$EventVenue .'</li>';
111 }
112@@ -75,7 +75,7 @@
113 }
114 ?>
115 </ul>
116- <a class="more-link" href="<?php echo get_permalink($post->ID) ?>"><?php _e('More Info', $this->pluginDomain); ?></a>
117+ <a class="more-link" href="<?php echo get_permalink($post->ID) ?>"><?php _e('More Info', $this->pluginDomain); ?> &raquo; </a>
118 </div>
119 </div>
120
121
122=== modified file 'wp-content/themes/ubuntu-party_light/index.php'
123--- wp-content/themes/ubuntu-party_light/index.php 2011-02-06 23:57:41 +0000
124+++ wp-content/themes/ubuntu-party_light/index.php 2011-02-08 11:02:33 +0000
125@@ -49,21 +49,20 @@
126 </a>
127 <?php } ?>
128 <div class="info">
129- <a href="<?php the_permalink() ?>" rel="bookmark" class="title"><?php the_title(); ?></a>
130+ <h3><a href="<?php the_permalink() ?>" rel="bookmark" class="title"><?php the_title(); ?></a></h3>
131 <ul class="meta">
132- <?php if (array_key_exists("Date", $custom_fields) && $custom_fields['Date'][0] != "") { ?>
133- <li class="Date"><?php echo $custom_fields['Date'][0] ?></li>
134- <?php } ?>
135- <?php if (array_key_exists("Lieu", $custom_fields) && $custom_fields['Lieu'][0] != "") { ?>
136- <li class="Lieu"><?php echo $custom_fields['Lieu'][0] ?></li>
137- <?php } ?>
138- <?php if (array_key_exists("LieuPrecision", $custom_fields) && $custom_fields['LieuPrecision'][0] != "") { ?>
139- <li class="LieuPrecision"><?php echo $custom_fields['LieuPrecision'][0] ?></li>
140- <?php } ?>
141- <?php if (array_key_exists("Web", $custom_fields) && $custom_fields['Web'][0] != "") { ?>
142- <li class="Web"><a href="<?php echo $custom_fields['Web'][0] ?>" alt="site internet de l'annonce" target="_blank">lien externe</a></li>
143- <?php } ?>
144- <li><?php comments_popup_link('', '1 commentaire', '% commentaires', 'comments', ''); ?></li>
145+ <li>[publié le <?php the_time('j M Y') ?> <?php comments_popup_link('', '| 1 commentaire', '| % commentaires', '| comments', ''); ?>]</li>
146+ <?php if (is_event()) : ?>
147+ <li class="Date"><?php echo the_event_start_date(); ?></li>
148+ <?php if ( the_event_venue() ) : ?>
149+ <li class="Lieu"><?php echo the_event_venue(); ?></li>
150+ <?php endif; ?>
151+ <?php if( the_event_city() ) : ?>
152+ <li class="LieuPrecision">
153+ <?php echo the_event_city(); ?><?php if(the_event_country()) : ?>, <?php echo the_event_country(); ?><?php endif; ?>
154+ </li>
155+ <?php endif; ?>
156+ <?php endif; ?>
157 </ul>
158 </div>
159 </div>
160@@ -107,34 +106,36 @@
161 <!-- display of bottom div -->
162 <div id="bottom" class="clearfloat">
163
164- <div id="front-list">
165- <h2><a href="/category/event/" style="color:inherit">Évènements</a></h2>
166+ <div id="content">
167+ <h2 class="title"><a href="/category/event/" style="color:inherit">Actualités</a></h2>
168
169 <?php $page = (get_query_var('paged')) ? get_query_var('paged') : 1; ?>
170- <?php query_posts("category_name=event&paged=$page&posts_per_page=6"); ?>
171+ <?php query_posts("category_name=featured&paged=$page&posts_per_page=6"); ?>
172
173 <?php while (have_posts()) : the_post(); ?>
174- <div class="clearfloat">
175-
176- <?php if(0){?>
177- <h3 class=cat_title><?php the_category(', '); ?> &raquo</h3>
178- <?php }?>
179-
180- <div class="title"><a href="<?php the_permalink() ?>" rel="bookmark"><?php the_title(); ?></a></div>
181-
182- <div class="spoiler">
183+ <div class="clearfloat">
184+ <h2 class="title"><a href="<?php the_permalink() ?>" rel="bookmark"><?php the_title(); ?></a></h2>
185+ <div class="meta" style="float:right;">
186+ [publié le <?php the_time('j M Y') ?> | <?php comments_popup_link('Aucuns commentaires', 'Un Commentaire', '% Commentaires');?> <?php if(function_exists('the_views')) { echo " | "; the_views(); } ?>]
187+ </div>
188+ <div class="spoiler">
189 <?php $values = get_post_custom_values("Image"); ?>
190-
191 <?php if (isset($values[0])) { ?>
192- <a href="<?php the_permalink() ?>" rel="bookmark" title="Permalien vers <?php the_title(); ?>">
193- <img src="<?php echo bloginfo('template_url'); ?>/scripts/timthumb.php?src=/<?php $values = get_post_custom_values("Image"); echo $values[0]; ?>&w=130&h=130&zc=1&q=100" alt="<?php the_title(); ?>" class="left" width="130px" height="130px" />
194- </a>
195+ <a href="<?php the_permalink() ?>" rel="bookmark" title="Permalien vers <?php the_title(); ?>">
196+ <img src="<?php echo bloginfo('template_url'); ?>/scripts/timthumb.php?src=/<?php echo $values[0]; ?>&w=130&h=130&zc=1&q=100" alt="<?php the_title(); ?>" class="left" width="130px" height="130px" />
197+ </a>
198+ <?php } else { ?>
199+ <a href="<?php the_permalink() ?>" rel="bookmark" title="Permalien vers <?php the_title(); ?>">
200+ <img src="<?php echo bloginfo('template_url'); ?>/images/imagenull.png" alt="<?php the_title(); ?>" class="left" width="130px" />
201+ </a>
202 <?php } ?>
203-
204- <?php get_metas($post->ID);?>
205- <?php/* the_excerpt(); */?>
206+ <div class="spoiler_text">
207+ <h4 class="meta">catégories : <?php the_category(', '); ?></h4>
208+ <?php the_excerpt(); ?>
209 </div>
210 </div>
211+
212+ </div>
213 <?php endwhile; ?>
214
215 <div class="navigation">
216
217=== modified file 'wp-content/themes/ubuntu-party_light/style.css'
218--- wp-content/themes/ubuntu-party_light/style.css 2011-02-06 23:43:54 +0000
219+++ wp-content/themes/ubuntu-party_light/style.css 2011-02-08 11:02:33 +0000
220@@ -390,7 +390,7 @@
221 #cat-1, #cat-3, #cat-5 {border-top:8px solid #5E2750;}
222 #cat-2, #cat-4 {border-top:8px solid #F15D22;}
223
224-.category span.cat_title, #front-popular h3, #front-list .cat_title, #archive .cat_title {
225+.category span.cat_title, #front-popular h3, #front-list .cat_title, #archive .cat_title, #content .cat_title {
226 margin:0;
227 font-weight:bold;
228 font-size:1.5em;
229@@ -431,7 +431,7 @@
230 float:left;
231 }
232
233-#archive {
234+#archive, #content {
235 padding-top:15px;
236 font-size:1.05em;
237 line-height:1.75em;
238@@ -441,24 +441,28 @@
239 padding: 0px 10px 0 10px;
240 }
241
242-#front-list .title, #archive .title {
243+#front-list .title, #archive .title, #content .title {
244 font-weight:bold;
245 font-size:1.8em ;
246 letter-spacing:-0.05em;
247 }
248
249-#front-list .clearfloat, #archive .clearfloat {
250+#front-list .clearfloat, #archive .clearfloat, #content .clearfloat {
251 padding-bottom:10px;
252 border-bottom:1px dotted #ccc;
253 margin-bottom:10px;
254 }
255
256-#front-list .spoiler, #archive .spoiler {
257+#front-list .spoiler, #archive .spoiler, #content .spoiler {
258 display:block;
259 margin-top:3px;
260 }
261
262-#front-list p, #archive p {
263+#archive .spoiler_text, #content .spoiler_text {
264+ padding-left:146px;
265+}
266+
267+#front-list p, #archive p, #content p {
268 margin:0px;
269 padding:0px;
270 }
271@@ -541,7 +545,7 @@
272 margin-left:20px;
273 }
274
275-.post img, .post a img, #front-list img, #archive img {
276+.post img, .post a img, #front-list img, #archive img, #content img {
277 border:1px solid #ccc;
278 margin:0 10px 5px 0;
279 padding:2px;

Subscribers

People subscribed via source and target branches