Quam Plures

Merge lp:~quam-plures-core/quam-plures/qp-edb4 into lp:quam-plures

  1. qp-edb4
  2. Merge into trunk
Proposed by EdB
Status: Merged
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/qp-edb4
Merge into: lp:quam-plures
Diff against target: 8251 lines (+2031/-2198)
92 files modified
a_notemplate.php (+240/-294)
conf/_icons.php (+56/-0)
contact.php (+40/-47)
inc/_core/__core.init.php (+3/-40)
inc/tools/system.ctrl.php (+1/-1)
install/_functions_create.php (+5/-5)
install/_functions_evoupgrade.php (+5/-1)
multiblogs.php (+199/-213)
summary.php (+91/-106)
templates/_404_not_found.disp.php (+26/-28)
templates/_arcdir.disp.php (+9/-9)
templates/_atom/comments.main.php (+6/-7)
templates/_atom/index.main.php (+33/-35)
templates/_body_footer.inc.php (+3/-5)
templates/_body_header.inc.php (+1/-3)
templates/_catdir.disp.php (+7/-11)
templates/_comments.disp.php (+5/-7)
templates/_html_footer.inc.php (+1/-4)
templates/_html_header.inc.php (+2/-3)
templates/_item_comment.inc.php (+14/-19)
templates/_item_comment_form.inc.php (+34/-26)
templates/_item_comment_wp.inc.php (+16/-21)
templates/_item_content.inc.php (+59/-58)
templates/_item_feedback.inc.php (+27/-25)
templates/_mediaidx.disp.php (+20/-23)
templates/_msgform.disp.php (+9/-9)
templates/_rdf/comments.main.php (+7/-7)
templates/_rdf/index.main.php (+60/-64)
templates/_rss/comments.main.php (+5/-6)
templates/_rss/index.main.php (+32/-34)
templates/_rss2/comments.main.php (+6/-7)
templates/_rss2/index.main.php (+78/-78)
templates/_sitemap/index.main.php (+2/-2)
templates/_subs.disp.php (+11/-11)
templates/_toolbar.inc.php (+5/-7)
templates/_user.disp.php (+4/-2)
templates/_wp_compatibility.inc.php (+83/-84)
templates/asevo/_body_footer.inc.php (+5/-5)
templates/asevo/_item_block.inc.php (+21/-22)
templates/asevo/index.main.php (+8/-8)
templates/basic/_item_content.inc.php (+11/-11)
templates/basic/_item_feedback.inc.php (+15/-17)
templates/basic/index.main.php (+29/-31)
templates/custom/_item_block.inc.php (+21/-23)
templates/custom/_template.class.php (+4/-4)
templates/custom/index.main.php (+10/-10)
templates/evocamp/_body_footer.inc.php (+5/-7)
templates/evocamp/_item_block.inc.php (+24/-25)
templates/evocamp/index.main.php (+4/-6)
templates/evocamp/page.main.php (+9/-12)
templates/evocamp/posts.main.php (+6/-8)
templates/evocamp/single.main.php (+21/-24)
templates/evopress/_body_footer.inc.php (+5/-7)
templates/evopress/_item_block.inc.php (+22/-23)
templates/evopress/index.main.php (+7/-5)
templates/evopress/page.main.php (+6/-7)
templates/evopress/posts.main.php (+5/-5)
templates/evopress/single.main.php (+22/-23)
templates/glossyblue/_body_footer.inc.php (+5/-5)
templates/glossyblue/_item_block.inc.php (+21/-22)
templates/glossyblue/_item_feedback.inc.php (+38/-39)
templates/glossyblue/index.main.php (+7/-7)
templates/glossyblue/page.main.php (+6/-9)
templates/glossyblue/posts.main.php (+6/-8)
templates/glossyblue/print.css (+4/-4)
templates/glossyblue/single.main.php (+22/-32)
templates/glossyblue/style.css (+4/-4)
templates/license.txt (+46/-46)
templates/miami_blue/_item_block.inc.php (+23/-25)
templates/miami_blue/index.main.php (+12/-12)
templates/natural_pink/_body_footer.inc.php (+5/-7)
templates/natural_pink/_item_block.inc.php (+20/-22)
templates/natural_pink/index.main.php (+12/-12)
templates/nifty_corners/_body_footer.inc.php (+5/-7)
templates/nifty_corners/_item_block.inc.php (+22/-25)
templates/nifty_corners/index.main.php (+12/-12)
templates/nifty_corners/rsc/nifty_corners.js (+90/-90)
templates/photoblog/_body_footer.inc.php (+5/-7)
templates/photoblog/_html_header.inc.php (+5/-6)
templates/photoblog/_item_block.inc.php (+33/-35)
templates/photoblog/feedback_popup.main.php (+4/-6)
templates/photoblog/index.main.php (+6/-6)
templates/pixelgreen/_item_block.inc.php (+23/-25)
templates/pixelgreen/index.main.php (+10/-10)
templates/pixelgreen/style.css (+6/-6)
templates/terrafirma/_item_block.inc.php (+19/-21)
templates/terrafirma/_item_comment.inc.php (+17/-23)
templates/terrafirma/index.main.php (+9/-9)
templates/terrafirma/license.txt (+38/-38)
templates/terrafirma/style.css (+12/-12)
templates/vastitude/_item_block.inc.php (+6/-8)
templates/vastitude/index.main.php (+13/-13)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/qp-edb4
Reviewer Review Type Date Requested Status
Tilman Blumenbach (community) merge Approve
Review via email: mp+17010@code.launchpad.net
To post a comment you must log in.
Revision history for this message
EdB (edb) wrote :

I wonder if this is the right hoop today?

lp:~quam-plures-core/quam-plures/qp-edb4 updated
7402. By Tilman Blumenbach

evoBar: Removed superfluous separator.

Revision history for this message
Tilman Blumenbach (tblue) wrote :

Looks OK. I fixed a small UI bug, though.

review: Approve (merge)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'a_notemplate.php'
2--- a_notemplate.php 2010-01-04 17:32:41 +0000
3+++ a_notemplate.php 2010-01-09 20:22:17 +0000
4@@ -13,7 +13,10 @@
5 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
6 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
7 *
8- * @todo EdB: figure out if this useful, shed if not else embrace
9+ * @todo EdB: figure out if this useful, shed if not else embrace and move to /templates/
10+ *
11+ * @todo EdB: template_widget.foo.sample.php files are not complete
12+ * @todo EdB: Plugins__call_by_code.sample.php file is not complete
13 *
14 * @package templates
15 */
16@@ -66,7 +69,7 @@
17 $PageCache = & new PageCache( NULL );
18 // Check for cached content & Start caching if needed:
19 if( ! $PageCache->check() )
20-{ // Cache miss, we have to generate:
21+{ // Cache miss, we have to generate:
22 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
23
24
25@@ -74,24 +77,20 @@
26 // Do inits depending on current $disp:
27 template_init( $disp );
28
29-add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
30+add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
31
32 header_content_type( 'text/html' );
33 ?>
34 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
35-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>"><!-- InstanceBegin template="/Templates/Standard.dwt" codeOutsideHTMLIsLocked="false" -->
36+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
37 <head>
38-<!-- InstanceBeginEditable name="doctitle" -->
39 <title><?php
40 // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
41 request_title( array(
42 'auto_pilot' => 'seo_title',
43 ) );
44- // ------------------------------ END OF REQUEST TITLE -----------------------------
45 ?></title>
46-<!-- InstanceEndEditable -->
47 <link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />
48-<!-- InstanceBeginEditable name="head" -->
49 <?php template_content_meta(); /* Charset for static pages */ ?>
50 <?php $Plugins->trigger_event( 'TemplateBeginHtmlHead' ); ?>
51 <?php template_base_tag(); /* You're not using any template here but this won't hurt. However it will be very helpfull to have this here when you make the switch to a template! */ ?>
52@@ -122,127 +121,106 @@
53
54 <div class="pageHeader">
55 <?php
56- // --------------------------------- START OF BLOG LIST --------------------------------
57- template_widget( array(
58- // CODE for the widget:
59- 'widget' => 'colls_list_public',
60- // Optional display params
61- 'block_start' => '<div class="NavBar">',
62- 'block_end' => '</div>',
63- 'block_display_title' => false,
64- 'list_start' => '',
65- 'list_end' => '',
66- 'item_start' => '',
67- 'item_end' => '',
68- 'item_selected_start' => '',
69- 'item_selected_end' => '',
70- 'link_selected_class' => 'NavButton2',
71- 'link_default_class' => 'NavButton2',
72- ) );
73- // ---------------------------------- END OF BLOG LIST ---------------------------------
74+// display the Public Blog List widget
75+template_widget( array(
76+ 'widget' => 'colls_list_public',
77+ // block-level params...
78+ 'block_start' => '<div class="NavBar">',
79+ 'block_end' => '</div>',
80+ 'block_display_title' => false,
81+ // list params...
82+ 'list_start' => '',
83+ 'list_end' => '',
84+ 'item_start' => '',
85+ 'item_end' => '',
86+ 'item_selected_start' => '',
87+ 'item_selected_end' => '',
88+ // miscellaneous params...
89+ 'link_selected_class' => 'NavButton2',
90+ 'link_default_class' => 'NavButton2',
91+) );
92 ?>
93-<!-- InstanceEndEditable -->
94+
95 <div class="pageTitle">
96-<h1 id="pageTitle"><!-- InstanceBeginEditable name="PageTitle" --><?php $Blog->disp( 'name', 'htmlbody' ) ?><!-- InstanceEndEditable --></h1>
97-</div>
98-</div>
99-
100-
101-<div class="pageSubTitle"><!-- InstanceBeginEditable name="SubTitle" --><?php $Blog->disp( 'tagline', 'htmlbody' ) ?><!-- InstanceEndEditable --></div>
102-
103-
104-<div class="main"><!-- InstanceBeginEditable name="Main" -->
105+<h1 id="pageTitle"><?php $Blog->disp( 'name', 'htmlbody' ) ?></h1>
106+</div>
107+
108+</div>
109+
110+<div class="pageSubTitle"><?php $Blog->disp( 'tagline', 'htmlbody' ) ?></div>
111+
112+<div class="main">
113
114 <div class="bPosts">
115-
116+<?php
117+// ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
118+messages( array(
119+ 'block_start' => '<div class="action_messages">',
120+ 'block_end' => '</div>',
121+) );
122+
123+// ------------------- PREV/NEXT POST LINKS (SINGLE POST MODE) -------------------
124+item_prevnext_links( array(
125+ 'block_start' => '<table class="prevnext_post"><tr>',
126+ 'prev_start' => '<td>',
127+ 'prev_end' => '</td>',
128+ 'next_start' => '<td class="right">',
129+ 'next_end' => '</td>',
130+ 'block_end' => '</tr></table>',
131+) );
132+
133+// ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
134+request_title( array(
135+ 'title_before'=> '<h2>',
136+ 'title_after' => '</h2>',
137+ 'title_none' => '',
138+ 'glue' => ' - ',
139+ 'title_single_disp' => true,
140+ 'format' => 'htmlbody',
141+) );
142+
143+// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
144+mainlist_page_links( array(
145+ 'block_start' => '<p class="center"><strong>',
146+ 'block_end' => '</strong></p>',
147+) );
148+
149+// ------------------------------------ START OF POSTS ----------------------------------------
150+// Display message if no post:
151+display_if_empty();
152+
153+while( $Item = & mainlist_get_item() )
154+{ // For each blog post, do everything below up to the closing curly brace "}"
155+
156+ // ------------------------------ DATE SEPARATOR ------------------------------
157+ $MainList->date_if_changed( array(
158+ 'before' => '<h2>',
159+ 'after' => '</h2>',
160+ 'date_format' => '#',
161+ ) );
162+ ?>
163+ <div id="<?php $Item->anchor_id() ?>" class="bPost bPost<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
164+
165+ <div class="bSmallHead">
166 <?php
167- // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
168- messages( array(
169- 'block_start' => '<div class="action_messages">',
170- 'block_end' => '</div>',
171+ $Item->permanent_link( array(
172+ 'text' => '#icon#',
173 ) );
174- // --------------------------------- END OF MESSAGES ---------------------------------
175- ?>
176-
177- <?php
178- // ------------------- PREV/NEXT POST LINKS (SINGLE POST MODE) -------------------
179- item_prevnext_links( array(
180- 'block_start' => '<table class="prevnext_post"><tr>',
181- 'prev_start' => '<td>',
182- 'prev_end' => '</td>',
183- 'next_start' => '<td class="right">',
184- 'next_end' => '</td>',
185- 'block_end' => '</tr></table>',
186- ) );
187- // ------------------------- END OF PREV/NEXT POST LINKS -------------------------
188- ?>
189-
190- <?php
191- // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
192- request_title( array(
193- 'title_before'=> '<h2>',
194- 'title_after' => '</h2>',
195- 'title_none' => '',
196- 'glue' => ' - ',
197- 'title_single_disp' => true,
198- 'format' => 'htmlbody',
199- ) );
200- // ------------------------------ END OF REQUEST TITLE -----------------------------
201- ?>
202-
203- <?php
204- // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
205- mainlist_page_links( array(
206- 'block_start' => '<p class="center"><strong>',
207- 'block_end' => '</strong></p>',
208- ) );
209- // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
210- ?>
211-
212-
213- <!-- =================================== START OF MAIN AREA =================================== -->
214-
215- <?php // ------------------------------------ START OF POSTS ----------------------------------------
216- // Display message if no post:
217- display_if_empty();
218-
219- while( $Item = & mainlist_get_item() )
220- { // For each blog post, do everything below up to the closing curly brace "}"
221- ?>
222-
223- <?php
224- // ------------------------------ DATE SEPARATOR ------------------------------
225- $MainList->date_if_changed( array(
226- 'before' => '<h2>',
227- 'after' => '</h2>',
228- 'date_format' => '#',
229- ) );
230- ?>
231- <div id="<?php $Item->anchor_id() ?>" class="bPost bPost<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
232-
233- <div class="bSmallHead">
234- <?php
235- $Item->permanent_link( array(
236- 'text' => '#icon#',
237- ) );
238- ?>
239- <?php
240- $Item->issue_time(); // Post issue time
241- ?>
242- <?php
243- $Item->categories( array(
244- 'before' => ', '.T_('Categories').': ',
245- 'after' => ' ',
246- 'include_main' => true,
247- 'include_other' => true,
248- 'include_external'=> true,
249- 'link_categories' => true,
250- ) );
251+
252+ $Item->issue_time(); // Post issue time
253+
254+ $Item->categories( array(
255+ 'before' => ', '.T_('Categories').': ',
256+ 'after' => ' ',
257+ 'include_main' => true,
258+ 'include_other' => true,
259+ 'include_external'=> true,
260+ 'link_categories' => true,
261+ ) );
262 ?>
263 </div>
264
265 <h3 class="bTitle"><?php $Item->title(); ?></h3>
266-
267 <?php
268 // --- --- --- --- --- --- --- --- --- --- ---
269 // --- POST CONTENT INCLUDED HERE ---
270@@ -251,42 +229,41 @@
271 ) );
272
273 // List all tags attached to this post:
274- $Item->tags( array(
275- 'before' => '<div class="bSmallPrint">'.T_('Tags').': ',
276- 'after' => '</div>',
277- 'separator' => ', ',
278- ) );
279- ?>
280-
281- <div class="bSmallPrint">
282- <?php
283- // Link to comments, trackbacks, etc.:
284- $Item->feedback_link( array(
285- 'type' => 'comments',
286- 'link_before' => '',
287- 'link_after' => ' &bull; ',
288- 'link_text_zero' => '#',
289- 'link_text_one' => '#',
290- 'link_text_more' => '#',
291- 'link_title' => '#',
292- 'use_popup' => false,
293- ) );
294- ?>
295- <?php
296- // Link to comments, trackbacks, etc.:
297- $Item->feedback_link( array(
298- 'type' => 'trackbacks',
299- 'link_before' => '',
300- 'link_after' => ' &bull; ',
301- 'link_text_zero' => '#',
302- 'link_text_one' => '#',
303- 'link_text_more' => '#',
304- 'link_title' => '#',
305- 'use_popup' => false,
306- ) );
307- ?>
308-
309- <?php $Item->permanent_link(); ?>
310+ $Item->tags( array(
311+ 'before' => '<div class="bSmallPrint">'.T_('Tags').': ',
312+ 'after' => '</div>',
313+ 'separator' => ', ',
314+ ) );
315+ ?>
316+
317+ <div class="bSmallPrint">
318+ <?php
319+ // Link to comments, trackbacks, etc.:
320+ $Item->feedback_link( array(
321+ 'type' => 'comments',
322+ 'link_before' => '',
323+ 'link_after' => ' &bull; ',
324+ 'link_text_zero' => '#',
325+ 'link_text_one' => '#',
326+ 'link_text_more' => '#',
327+ 'link_title' => '#',
328+ 'use_popup' => false,
329+ ) );
330+
331+ // Link to comments, trackbacks, etc.:
332+ $Item->feedback_link( array(
333+ 'type' => 'trackbacks',
334+ 'link_before' => '',
335+ 'link_after' => ' &bull; ',
336+ 'link_text_zero' => '#',
337+ 'link_text_one' => '#',
338+ 'link_text_more' => '#',
339+ 'link_title' => '#',
340+ 'use_popup' => false,
341+ ) );
342+ ?>
343+
344+ <?php $Item->permanent_link(); ?>
345 </div>
346
347 <?php
348@@ -299,17 +276,16 @@
349 ?>
350 </div>
351
352- <?php } // ---------------------------------- END OF POSTS ------------------------------------ ?>
353-
354 <?php
355- // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
356- mainlist_page_links( array(
357- 'block_start' => '<p class="center"><strong>',
358- 'block_end' => '</strong></p>',
359- 'prev_text' => '&lt;&lt;',
360- 'next_text' => '&gt;&gt;',
361- ) );
362- // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
363+}
364+
365+// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
366+mainlist_page_links( array(
367+ 'block_start' => '<p class="center"><strong>',
368+ 'block_end' => '</strong></p>',
369+ 'prev_text' => '&lt;&lt;',
370+ 'next_text' => '&gt;&gt;',
371+) );
372
373 // --- --- --- --- --- --- --- --- --- --- ---
374 // MAIN CONTENT INCLUDED HERE
375@@ -336,139 +312,109 @@
376 <?php
377 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
378 mainlist_page_links( array(
379- 'block_start' => '<p class="center"><strong>',
380- 'block_end' => '</strong></p>',
381- 'links_format' => '$prev$ :: $next$',
382- 'prev_text' => '&lt;&lt; '.T_('Previous'),
383- 'next_text' => T_('Next').' &gt;&gt;',
384- ) );
385- // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
386- ?>
387-
388- <?php
389- // --------------------------------- START OF COMMON LINKS --------------------------------
390- // Call the coll_common_links widget:
391- template_widget( array(
392- // CODE for the widget:
393- 'widget' => 'coll_common_links',
394- // Optional display params:
395- 'show_recently' => true,
396- 'show_archives' => true,
397- 'show_categories' => false,
398- 'show_latestcomments' => false,
399- 'list_start' => '<ul>',
400- 'list_end' => '</ul>',
401- 'item_start' => '<li>',
402- 'item_end' => '</li>',
403- ) );
404- // ---------------------------------- END OF COMMON LINKS ---------------------------------
405- ?>
406-
407- <?php
408- // ------------------------------- START OF CALENDAR ---------------------------------
409- // Call the Calendar plugin (if installed):
410- $Plugins->call_by_code( 'evo_Calr', array( // Params follow:
411- 'block_start' => '',
412- 'block_end' => '',
413- 'displaycaption' => true,
414- 'linktomontharchive' => false,
415- ) );
416- // -------------------------------- END OF CALENDAR ----------------------------------
417- ?>
418- </div>
419-
420- <?php
421- // --------------------------------- START OF SEARCH FORM --------------------------------
422- // Call the coll_search_form widget:
423- template_widget( array(
424- // CODE for the widget:
425- 'widget' => 'coll_search_form',
426- // Optional display params:
427- 'block_start' => '<div class="bSideItem">',
428- 'block_end' => '</div>',
429- 'block_title_start' => '<h3 class="sideItemTitle">',
430- 'block_title_end' => '</h3>',
431- ) );
432- // ---------------------------------- END OF SEARCH FORM ---------------------------------
433- ?>
434-
435- <?php
436- // --------------------------------- START OF CATEGORY LIST --------------------------------
437- template_widget( array(
438- // CODE for the widget:
439- 'widget' => 'coll_category_list',
440- // Optional display params
441- 'block_start' => '<div class="bSideItem">',
442- 'block_end' => '</div>',
443- 'block_title_start' => '<h3 class="sideItemTitle">',
444- 'block_title_end' => '</h3>',
445- ) );
446- // ---------------------------------- END OF CATEGORY LIST ---------------------------------
447- ?>
448-
449- <?php
450- // -------------------------- ARCHIVES INSERTED HERE -----------------------------
451- $Plugins->call_by_code( 'evo_Arch', array(
452- 'block_start' => '<div class="bSideItem">',
453- 'block_end' => '</div>',
454- 'block_title_start' => '<h3>',
455- 'block_title_end' => '</h3>',
456- ) );
457- // ------------------------------ END OF ARCHIVES --------------------------------
458- ?>
459-
460- <?php
461- // --------------------------------- START OF LINKBLOG --------------------------------
462- // Call the coll_search_form widget:
463- template_widget( array(
464- // CODE for the widget:
465- 'widget' => 'linkblog',
466- // Optional display params:
467- 'block_start' => '<div class="bSideItem">',
468- 'block_end' => '</div>',
469- 'block_title_start' => '<h3 class="sideItemTitle">',
470- 'block_title_end' => '</h3>',
471- ) );
472- // ---------------------------------- END OF LINKBLOG ---------------------------------
473- ?>
474-
475- <?php
476- // --------------------------------- START OF USER TOOLS --------------------------------
477- template_widget( array(
478- // CODE for the widget:
479- 'widget' => 'user_tools',
480- // Optional display params
481- 'block_start' => '<div class="bSideItem">',
482- 'block_end' => '</div>',
483- 'block_title_start' => '<h3 class="sideItemTitle">',
484- 'block_title_end' => '</h3>',
485- ) );
486- // ---------------------------------- END OF USER TOOLS ---------------------------------
487- ?>
488-
489- <?php
490- // --------------------------------- START OF XML FEEDS --------------------------------
491- template_widget( array(
492- // CODE for the widget:
493- 'widget' => 'coll_xml_feeds',
494- // Optional display params
495- 'block_start' => '<div class="bSideItem">',
496- 'block_end' => '</div>',
497- 'block_title_start' => '<h3 class="sideItemTitle">',
498- 'block_title_end' => '</h3>',
499- ) );
500- // ---------------------------------- END OF XML FEEDS ---------------------------------
501- ?>
502-
503-</div>
504-<!-- InstanceEndEditable --></div>
505+ 'block_start' => '<p class="center"><strong>',
506+ 'block_end' => '</strong></p>',
507+ 'links_format' => '$prev$ :: $next$',
508+ 'prev_text' => '&lt;&lt; '.T_('Previous'),
509+ 'next_text' => T_('Next').' &gt;&gt;',
510+ ) );
511+
512+// display the Common Links widget
513+template_widget( array(
514+ 'widget' => 'coll_common_links',
515+ // list params...
516+ 'list_start' => '<ul>',
517+ 'list_end' => '</ul>',
518+ 'item_start' => '<li>',
519+ 'item_end' => '</li>',
520+ // widget-specific params...
521+ 'show_recently' => true,
522+ 'show_archives' => true,
523+ 'show_categories' => false,
524+ 'show_latestcomments' => false,
525+ ) );
526+
527+// display the Calendar plugin (if installed)
528+$Plugins->call_by_code( 'evo_Calr', array(
529+ 'block_start' => '',
530+ 'block_end' => '',
531+ 'displaycaption' => true,
532+ 'linktomontharchive' => false,
533+) );
534+?>
535+</div>
536+
537+<?php
538+// display the Search Form widget
539+template_widget( array(
540+ 'widget' => 'coll_search_form',
541+ // block-level params...
542+ 'block_start' => '<div class="bSideItem">',
543+ 'block_end' => '</div>',
544+ 'block_title_start' => '<h3 class="sideItemTitle">',
545+ 'block_title_end' => '</h3>',
546+) );
547+
548+// display the Category List widget
549+template_widget( array(
550+ 'widget' => 'coll_category_list',
551+ // block-level params...
552+ 'block_start' => '<div class="bSideItem">',
553+ 'block_end' => '</div>',
554+ 'block_title_start' => '<h3 class="sideItemTitle">',
555+ 'block_title_end' => '</h3>',
556+) );
557+
558+// display the Archives plugin (if installed)
559+$Plugins->call_by_code( 'evo_Arch', array(
560+ 'block_start' => '<div class="bSideItem">',
561+ 'block_end' => '</div>',
562+ 'block_title_start' => '<h3>',
563+ 'block_title_end' => '</h3>',
564+) );
565+
566+// display the Linkblog widget
567+template_widget( array(
568+ 'widget' => 'linkblog',
569+ // block-level params...
570+ 'block_start' => '<div class="bSideItem">',
571+ 'block_end' => '</div>',
572+ 'block_title_start' => '<h3 class="sideItemTitle">',
573+ 'block_title_end' => '</h3>',
574+) );
575+
576+// display the User Tools widget
577+template_widget( array(
578+ 'widget' => 'user_tools',
579+ // block-level params...
580+ 'block_start' => '<div class="bSideItem">',
581+ 'block_end' => '</div>',
582+ 'block_title_start' => '<h3 class="sideItemTitle">',
583+ 'block_title_end' => '</h3>',
584+) );
585+
586+// display the XML Feeds widget
587+template_widget( array(
588+ 'widget' => 'coll_xml_feeds',
589+ // block-level params...
590+ 'block_start' => '<div class="bSideItem">',
591+ 'block_end' => '</div>',
592+ 'block_title_start' => '<h3 class="sideItemTitle">',
593+ 'block_title_end' => '</h3>',
594+) );
595+?>
596+</div>
597+
598+</div>
599+
600 <div class="footer">
601 This is a demo page for <a href="<?php echo $app_homepage; ?>"><?php echo $app_name; ?></a>.
602-<!-- InstanceBeginEditable name="Baseline" -->
603 <?php echo '</div>' ?>
604-<!-- InstanceEndEditable --></div>
605+
606+</div>
607+
608 </body>
609-<!-- InstanceEnd --></html>
610+</html>
611 <?php
612 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
613 // Save collected cached data if needed:
614
615=== modified file 'conf/_icons.php'
616--- conf/_icons.php 2010-01-02 11:59:24 +0000
617+++ conf/_icons.php 2010-01-09 20:22:17 +0000
618@@ -513,6 +513,62 @@
619 'alt' => '-',
620 'size' => array( 12, 12 ),
621 );
622+
623+ case 'file_css': return array(
624+ 'ext' => '\.css',
625+ 'file' => 'icons/fileicons/css.png',
626+ 'alt' => '',
627+ 'size' => array( 16, 16 ),
628+ );
629+ case 'file_mp3': return array(
630+ 'ext' => '\.(mp3)',
631+ 'file' => 'icons/fileicons/mp3.png',
632+ 'alt' => '',
633+ 'size' => array( 16, 16 ),
634+ );
635+ case 'file_m4a': return array(
636+ 'ext' => '\.(m4a)',
637+ 'file' => 'icons/fileicons/m4a.png',
638+ 'alt' => '',
639+ 'size' => array( 16, 16 ),
640+ );
641+ case 'file_mp4': return array(
642+ 'ext' => '\.(mp4)',
643+ 'file' => 'icons/fileicons/mp4.png',
644+ 'alt' => '',
645+ 'size' => array( 16, 16 ),
646+ );
647+ case 'file_mov': return array(
648+ 'ext' => '\.(mov)',
649+ 'file' => 'icons/fileicons/mov.png',
650+ 'alt' => '',
651+ 'size' => array( 16, 16 ),
652+ );
653+ case 'file_avi': return array(
654+ 'ext' => '\.(avi)',
655+ 'file' => 'icons/png/document/avi.png',
656+ 'alt' => '',
657+ 'size' => array( 16, 16 ),
658+ );
659+ case 'file_pls': return array(
660+ 'ext' => '\.(pls)',
661+ 'file' => 'icons/fileicons/pls.png',
662+ 'alt' => '',
663+ 'size' => array( 16, 16 ),
664+ );
665+ case 'file_video': return array(
666+ 'ext' => '\.(mpe?g)',
667+ 'file' => 'icons/fileicons/video.png',
668+ 'alt' => '',
669+ 'size' => array( 16, 16 ),
670+ );
671+ case 'file_wmv': return array(
672+ 'ext' => '\.(wmv)',
673+ 'file' => 'icons/fileicons/wmv.png',
674+ 'alt' => '',
675+ 'size' => array( 16, 16 ),
676+ );
677+
678 }
679 }
680
681
682=== modified file 'contact.php'
683--- contact.php 2010-01-04 17:32:41 +0000
684+++ contact.php 2010-01-09 20:22:17 +0000
685@@ -10,6 +10,8 @@
686 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
687 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
688 *
689+ * @todo EdB: this file needs to one day move to /templates/
690+ *
691 * @package templates
692 */
693
694@@ -38,7 +40,7 @@
695
696 // Note: This is an interactive page: not a good candidate for caching.
697
698-add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
699+add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
700
701 header_content_type( 'text/html' );
702 ?>
703@@ -70,43 +72,39 @@
704
705 <div class="pageHeader">
706 <?php
707- // --------------------------------- START OF BLOG LIST --------------------------------
708- template_widget( array(
709- // CODE for the widget:
710- 'widget' => 'colls_list_public',
711- // Optional display params
712- 'block_start' => '<div class="NavBar">',
713- 'block_end' => '</div>',
714- 'block_display_title' => false,
715- 'list_start' => '',
716- 'list_end' => '',
717- 'item_start' => '',
718- 'item_end' => '',
719- 'item_selected_start' => '',
720- 'item_selected_end' => '',
721- 'link_selected_class' => 'NavButton2',
722- 'link_default_class' => 'NavButton2',
723- ) );
724- // ---------------------------------- END OF BLOG LIST ---------------------------------
725+// display the Public Blog List widget
726+template_widget( array(
727+ 'widget' => 'colls_list_public',
728+ // block-level params...
729+ 'block_start' => '<div class="NavBar">',
730+ 'block_end' => '</div>',
731+ 'block_display_title' => false,
732+ // list params...
733+ 'list_start' => '',
734+ 'list_end' => '',
735+ 'item_start' => '',
736+ 'item_end' => '',
737+ 'item_selected_start' => '',
738+ 'item_selected_end' => '',
739+ // miscellaneous params...
740+ 'link_selected_class' => 'NavButton2',
741+ 'link_default_class' => 'NavButton2',
742+) );
743 ?>
744-<!-- InstanceEndEditable -->
745 <div class="pageTitle">
746-<h1 id="pageTitle"><!-- InstanceBeginEditable name="PageTitle" --><?php echo T_('Contact Form Demo') ?><!-- InstanceEndEditable --></h1>
747-</div>
748-</div>
749-
750-
751-<div class="pageSubTitle"><!-- InstanceBeginEditable name="SubTitle" --><?php echo T_('This demo displays a form to contact the site admin.') ?><!-- InstanceEndEditable --></div>
752-
753-
754-<div class="main"><!-- InstanceBeginEditable name="Main" -->
755-
756-
757+<h1 id="pageTitle"><?php echo T_('Contact Form Demo') ?></h1>
758+</div>
759+
760+</div>
761+
762+<div class="pageSubTitle"><?php echo T_('This demo displays a form to contact the site admin.') ?></div>
763+
764+<div class="main">
765 <?php
766 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
767 messages( array(
768- 'block_start' => '<div class="action_messages">',
769- 'block_end' => '</div>',
770+ 'block_start' => '<div class="action_messages">',
771+ 'block_end' => '</div>',
772 ) );
773 // --------------------------------- END OF MESSAGES ---------------------------------
774 ?>
775@@ -115,36 +113,31 @@
776 <?php
777 // ----------------------------- MESSAGE FORM ----------------------------
778 if( empty( $return ) )
779- { // We are *not* coming back after sending a message:
780+ { // We are *not* coming back after sending a message:
781
782 if( empty( $redirect_to ) )
783- { // We haven't asked for a specific return URL, so we'll come back to here with a param.
784- $redirect_to = url_add_param( $ReqURI, 'return=1', '&' );
785+ { // We haven't asked for a specific return URL, so we'll come back to here with a param.
786+ $redirect_to = url_add_param( $ReqURI, 'return=1', '&' );
787 }
788
789 // The form, per se:
790 require $templates_path.'_msgform.disp.php';
791 }
792 else
793- { // We are coming back after sending a message:
794+ { // We are coming back after sending a message:
795
796 echo '<p>'.T_('Thank you for your message. I will reply as soon as possible.').'</p>';
797
798 // This is useful for testing but does not really make sense on production:
799 echo '<p><a href="'.regenerate_url().'">'.T_('Send another message?').'</a></p>';
800 }
801- // ------------------------- END OF MESSAGE FORM -------------------------
802 ?>
803-
804-
805-
806-
807-
808-<!-- InstanceEndEditable --></div>
809+</div>
810+
811 <div class="footer">
812 This is a demo page for <a href="<?php echo $app_homepage; ?>"><?php echo $app_name; ?></a>.
813-<!-- InstanceBeginEditable name="Baseline" -->
814 <?php echo '</div>' ?>
815-<!-- InstanceEndEditable --></div>
816+</div>
817+
818 </body>
819-<!-- InstanceEnd --></html>
820+</html>
821
822=== modified file 'inc/_core/__core.init.php'
823--- inc/_core/__core.init.php 2010-01-02 08:34:34 +0000
824+++ inc/_core/__core.init.php 2010-01-09 20:22:17 +0000
825@@ -285,56 +285,19 @@
826 'text' => T_('About this system').'&hellip;',
827 'href' => $admin_url.'?ctrl=system',
828 );
829- $entries['b2evo']['entries'][] = array(
830- 'separator' => true,
831- );
832 }
833
834 if( $current_User->check_perm( 'blogs', 'create' ) )
835 {
836+ $entries['b2evo']['entries'][] = array(
837+ 'separator' => true,
838+ );
839 $entries['b2evo']['entries']['newblog'] = array(
840 'text' => T_('Create new blog').'&hellip;',
841 'href' => $admin_url.'?ctrl=collections&amp;action=new',
842 );
843- $entries['b2evo']['entries'][] = array(
844- 'separator' => true,
845- );
846 }
847
848- $entries['b2evo']['entries']['info'] = array(
849- 'text' => T_('More info'),
850- 'entries' => array(
851- 'b2evonet' => array(
852- 'text' => T_('Open quamplures.net'),
853- 'href' => $app_homepage,
854- 'target' => '_blank',
855- ),
856- 'forums' => array(
857- 'text' => T_('Open Support forums'),
858- 'href' => 'http://forums.quamplures.net/',
859- 'target' => '_blank',
860- ),
861- 'manual' => array(
862- 'text' => T_('Open Online manual'),
863- 'href' => 'http://manual.b2evolution.net/',
864- 'target' => '_blank',
865- ),
866- 'info_sep' => array(
867- 'separator' => true,
868- ),
869- 'twitter' => array(
870- 'text' => sprintf( T_('%s on twitter'), $app_name ),
871- 'href' => 'http://twitter.com/quamplures',
872- 'target' => '_blank',
873- ),
874- 'facebook' => array(
875- 'text' => sprintf( T_('%s on facebook'), $app_name ),
876- 'href' => 'http://www.facebook.com/b2evolution',
877- 'target' => '_blank',
878- ),
879- ),
880- );
881-
882
883 // CUSTOMIZE:
884 if( !empty($Blog) && $current_User->check_perm( 'blog_properties', 'edit', false, $Blog->ID ) )
885
886=== modified file 'inc/tools/system.ctrl.php'
887--- inc/tools/system.ctrl.php 2009-12-20 21:15:30 +0000
888+++ inc/tools/system.ctrl.php 2010-01-09 20:22:17 +0000
889@@ -102,7 +102,7 @@
890 }
891 elseif( $app_age > 6 )
892 {
893- disp_system_check( 'warning', sprintf( T_('This version is aging. You may want to check for newer releases on').' <a href="'.$app_homepage.'">'.$app_name.'</a>.' );
894+ disp_system_check( 'warning', sprintf( T_('This version is aging. You may want to check for newer releases on').' <a href="'.$app_homepage.'">'.$app_name.'</a>.' ) );
895 }
896 else
897 {
898
899=== modified file 'install/_functions_create.php'
900--- install/_functions_create.php 2010-01-02 08:49:01 +0000
901+++ install/_functions_create.php 2010-01-09 20:22:17 +0000
902@@ -240,11 +240,11 @@
903 (10, 'pps', 'Slideshow', 'pps', 'pps.gif', 'external', 1),
904 (11, 'zip', 'ZIP archive', 'application/zip', 'zip.gif', 'external', 1),
905 (12, 'php php3 php4 php5 php6', 'PHP script', 'application/x-httpd-php', 'php.gif', 'text', 0),
906- (13, 'css', 'Style sheet', 'text/css', '', 'text', 1),
907- (14, 'mp3', 'MPEG audio file', 'audio/mpeg', '', 'browser', 1),
908- (15, 'm4a', 'MPEG audio file', 'audio/x-m4a', '', 'browser', 1),
909- (16, 'mp4', 'MPEG video', 'video/mp4', '', 'browser', 1),
910- (17, 'mov', 'Quicktime video', 'video/quicktime', '', 'browser', 1)
911+ (13, 'css', 'Style sheet', 'text/css', 'css.png', 'text', 1),
912+ (14, 'mp3', 'MPEG audio file', 'audio/mpeg', 'mp3.png', 'browser', 1),
913+ (15, 'm4a', 'MPEG audio file', 'audio/x-m4a', 'm4a.png', 'browser', 1),
914+ (16, 'mp4', 'MPEG video', 'video/mp4', 'mp4.png', 'browser', 1),
915+ (17, 'mov', 'Quicktime video', 'video/quicktime', 'mov.png', 'browser', 1)
916 " );
917 echo "OK.<br />\n";
918
919
920=== modified file 'install/_functions_evoupgrade.php'
921--- install/_functions_evoupgrade.php 2010-01-02 08:34:34 +0000
922+++ install/_functions_evoupgrade.php 2010-01-09 20:22:17 +0000
923@@ -1258,7 +1258,11 @@
924 (10, 'pps', 'Slideshow', 'pps', 'pps.gif', 'external', 1),
925 (11, 'zip', 'ZIP archive', 'application/zip', 'zip.gif', 'external', 1),
926 (12, 'php php3 php4 php5 php6', 'PHP script', 'application/x-httpd-php', 'php.gif', 'text', 0),
927- (13, 'css', 'Style sheet', 'text/css', '', 'text', 1)
928+ (13, 'css', 'Style sheet', 'text/css', 'css.png', 'text', 1),
929+ (14, 'mp3', 'MPEG audio file', 'audio/mpeg', 'mp3.png', 'browser', 1),
930+ (15, 'm4a', 'MPEG audio file', 'audio/x-m4a', 'm4a.png', 'browser', 1),
931+ (16, 'mp4', 'MPEG video', 'video/mp4', 'mp4.png', 'browser', 1),
932+ (17, 'mov', 'Quicktime video', 'video/quicktime', 'mov.png', 'browser', 1)
933 " );
934 echo "OK.<br />\n";
935
936
937=== modified file 'multiblogs.php'
938--- multiblogs.php 2010-01-04 17:32:41 +0000
939+++ multiblogs.php 2010-01-09 20:22:17 +0000
940@@ -5,6 +5,8 @@
941 * If you're new to quam plures template system, you should not start with this file
942 * It will be easier to start examining blog_a.php or notemplate_a.php for instance...
943 *
944+ * @todo EdB: this file needs to one day move to /templates/
945+ *
946 * @package templates
947 */
948
949@@ -55,7 +57,7 @@
950 $PageCache = & new PageCache( NULL );
951 // Check for cached content & Start caching if needed:
952 if( ! $PageCache->check() )
953-{ // Cache miss, we have to generate:
954+{ // Cache miss, we have to generate:
955 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
956
957
958@@ -63,28 +65,24 @@
959 // Do inits depending on current $disp:
960 template_init( $disp );
961
962-add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
963+add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
964
965 header_content_type( 'text/html' );
966 ?>
967 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
968-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>"><!-- InstanceBegin template="/Templates/Standard.dwt" codeOutsideHTMLIsLocked="false" -->
969+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
970 <head>
971-<!-- InstanceBeginEditable name="doctitle" -->
972 <title><?php
973 // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
974 request_title( array(
975- 'title_before'=> '',
976- 'title_after' => ' - ',
977- 'title_none' => '',
978- 'glue' => ' - ',
979- 'format' => 'htmlhead',
980+ 'title_before'=> '',
981+ 'title_after' => ' - ',
982+ 'title_none' => '',
983+ 'glue' => ' - ',
984+ 'format' => 'htmlhead',
985 ) );
986- // ------------------------------ END OF REQUEST TITLE -----------------------------
987 ?>Multiblog Demo</title>
988- <!-- InstanceEndEditable -->
989 <link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />
990-<!-- InstanceBeginEditable name="head" -->
991 <?php template_base_tag(); /* You're not using any template here but this won't hurt. However it will be very helpful to have this here when you make the switch to a template! */ ?>
992 <?php template_description_tag(); ?>
993 <?php template_keywords_tag(); ?>
994@@ -113,38 +111,35 @@
995
996 <div class="pageHeader">
997 <?php
998- // --------------------------------- START OF BLOG LIST --------------------------------
999- template_widget( array(
1000- // CODE for the widget:
1001- 'widget' => 'colls_list_public',
1002- // Optional display params
1003- 'block_start' => '<div class="NavBar">',
1004- 'block_end' => '</div>',
1005- 'block_display_title' => false,
1006- 'list_start' => '',
1007- 'list_end' => '',
1008- 'item_start' => '',
1009- 'item_end' => '',
1010- 'item_selected_start' => '',
1011- 'item_selected_end' => '',
1012- 'link_selected_class' => 'NavButton2',
1013- 'link_default_class' => 'NavButton2',
1014- ) );
1015- // ---------------------------------- END OF BLOG LIST ---------------------------------
1016+// display the Public Blog List widget
1017+template_widget( array(
1018+ 'widget' => 'colls_list_public',
1019+ // block-level params...
1020+ 'block_start' => '<div class="NavBar">',
1021+ 'block_end' => '</div>',
1022+ 'block_display_title' => false,
1023+ // list params...
1024+ 'list_start' => '',
1025+ 'list_end' => '',
1026+ 'item_start' => '',
1027+ 'item_end' => '',
1028+ 'item_selected_start' => '',
1029+ 'item_selected_end' => '',
1030+ // miscellaneous params...
1031+ 'link_selected_class' => 'NavButton2',
1032+ 'link_default_class' => 'NavButton2',
1033+) );
1034 ?>
1035-<!-- InstanceEndEditable -->
1036 <div class="pageTitle">
1037-<h1 id="pageTitle"><!-- InstanceBeginEditable name="PageTitle" --><?php echo T_('Multiblog demo') ?><!-- InstanceEndEditable --></h1>
1038-</div>
1039-</div>
1040-
1041-
1042-<div class="pageSubTitle"><!-- InstanceBeginEditable name="SubTitle" --><?php echo T_('This demo template displays 3 blogs at once (1 on the left, 2 on the right)') ?><!-- InstanceEndEditable --></div>
1043-
1044-
1045-<div class="main"><!-- InstanceBeginEditable name="Main" -->
1046-
1047-<!-- =================================== START OF MAIN AREA =================================== -->
1048+<h1 id="pageTitle"><?php echo T_('Multiblog demo') ?></h1>
1049+</div>
1050+</div>
1051+
1052+
1053+<div class="pageSubTitle"><?php echo T_('This demo template displays 3 blogs at once (1 on the left, 2 on the right)') ?></div>
1054+
1055+
1056+<div class="main">
1057
1058 <div class="bPosts">
1059 <h2>#1: <a href="<?php $Blog->disp( 'blogurl', 'raw' ) ?>"><?php echo $Blog->disp( 'name', 'htmlbody' ) ?></a></h2>
1060@@ -152,53 +147,48 @@
1061 <?php
1062 // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
1063 request_title( array(
1064- 'title_before'=> '<h2>',
1065- 'title_after' => '</h2>',
1066- 'title_none' => '',
1067- 'glue' => ' - ',
1068- 'title_single_disp' => true,
1069- 'format' => 'htmlbody',
1070- ) );
1071- // ------------------------------ END OF REQUEST TITLE -----------------------------
1072- ?>
1073+ 'title_before'=> '<h2>',
1074+ 'title_after' => '</h2>',
1075+ 'title_none' => '',
1076+ 'glue' => ' - ',
1077+ 'title_single_disp' => true,
1078+ 'format' => 'htmlbody',
1079+ ) );
1080
1081- <?php // ------------------------------------ START OF POSTS ----------------------------------------
1082+ // ------------------------------------ START OF POSTS ----------------------------------------
1083 // Display message if no post:
1084 display_if_empty();
1085
1086 while( $Item = & mainlist_get_item() )
1087- { // For each blog post, do everything below up to the closing curly brace "}"
1088- ?>
1089-
1090- <?php
1091- // ------------------------------ DATE SEPARATOR ------------------------------
1092- $MainList->date_if_changed( array(
1093- 'before' => '<h2>',
1094- 'after' => '</h2>',
1095- 'date_format' => '#',
1096- ) );
1097- ?>
1098+ { // For each blog post, do everything below up to the closing curly brace "}"
1099+ // ------------------------------ DATE SEPARATOR ------------------------------
1100+ $MainList->date_if_changed( array(
1101+ 'before' => '<h2>',
1102+ 'after' => '</h2>',
1103+ 'date_format' => '#',
1104+ ) );
1105+ ?>
1106
1107 <div id="<?php $Item->anchor_id() ?>" class="bPost bPost<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
1108
1109- <div class="bSmallHead">
1110- <?php
1111- $Item->permanent_link( array(
1112- 'text' => '#icon#',
1113- ) );
1114- ?>
1115- <?php
1116- $Item->issue_time(); // Post issue time
1117- ?>
1118- <?php
1119- $Item->categories( array(
1120- 'before' => ', '.T_('Categories').': ',
1121- 'after' => ' ',
1122- 'include_main' => true,
1123- 'include_other' => true,
1124- 'include_external'=> true,
1125- 'link_categories' => true,
1126- ) );
1127+ <div class="bSmallHead">
1128+ <?php
1129+ $Item->permanent_link( array(
1130+ 'text' => '#icon#',
1131+ ) );
1132+ ?>
1133+ <?php
1134+ $Item->issue_time(); // Post issue time
1135+ ?>
1136+ <?php
1137+ $Item->categories( array(
1138+ 'before' => ', '.T_('Categories').': ',
1139+ 'after' => ' ',
1140+ 'include_main' => true,
1141+ 'include_other' => true,
1142+ 'include_external'=> true,
1143+ 'link_categories' => true,
1144+ ) );
1145 ?>
1146 </div>
1147
1148@@ -213,33 +203,33 @@
1149
1150 <div class="bSmallPrint">
1151 <?php
1152- // Link to comments, trackbacks, etc.:
1153- $Item->feedback_link( array(
1154- 'type' => 'comments',
1155- 'link_before' => '',
1156- 'link_after' => ' &bull; ',
1157- 'link_text_zero' => '#',
1158- 'link_text_one' => '#',
1159- 'link_text_more' => '#',
1160- 'link_title' => '#',
1161- 'use_popup' => false,
1162- ) );
1163- ?>
1164- <?php
1165- // Link to comments, trackbacks, etc.:
1166- $Item->feedback_link( array(
1167- 'type' => 'trackbacks',
1168- 'link_before' => '',
1169- 'link_after' => ' &bull; ',
1170- 'link_text_zero' => '#',
1171- 'link_text_one' => '#',
1172- 'link_text_more' => '#',
1173- 'link_title' => '#',
1174- 'use_popup' => false,
1175- ) );
1176- ?>
1177+ // Link to comments, trackbacks, etc.:
1178+ $Item->feedback_link( array(
1179+ 'type' => 'comments',
1180+ 'link_before' => '',
1181+ 'link_after' => ' &bull; ',
1182+ 'link_text_zero' => '#',
1183+ 'link_text_one' => '#',
1184+ 'link_text_more' => '#',
1185+ 'link_title' => '#',
1186+ 'use_popup' => false,
1187+ ) );
1188+ ?>
1189+ <?php
1190+ // Link to comments, trackbacks, etc.:
1191+ $Item->feedback_link( array(
1192+ 'type' => 'trackbacks',
1193+ 'link_before' => '',
1194+ 'link_after' => ' &bull; ',
1195+ 'link_text_zero' => '#',
1196+ 'link_text_one' => '#',
1197+ 'link_text_more' => '#',
1198+ 'link_title' => '#',
1199+ 'use_popup' => false,
1200+ ) );
1201+ ?>
1202
1203- <?php $Item->permanent_link(); ?>
1204+ <?php $Item->permanent_link(); ?>
1205 </div>
1206
1207 <?php
1208@@ -254,18 +244,15 @@
1209
1210 <?php
1211 } // ---------------------------------- END OF POSTS ------------------------------------
1212- ?>
1213
1214- <?php
1215 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
1216 mainlist_page_links( array(
1217- 'block_start' => '<p class="center"><strong>',
1218- 'block_end' => '</strong></p>',
1219- 'links_format' => '$prev$ :: $next$',
1220- 'prev_text' => '&lt;&lt; '.T_('Previous'),
1221- 'next_text' => T_('Next').' &gt;&gt;',
1222- ) );
1223- // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
1224+ 'block_start' => '<p class="center"><strong>',
1225+ 'block_end' => '</strong></p>',
1226+ 'links_format' => '$prev$ :: $next$',
1227+ 'prev_text' => '&lt;&lt; '.T_('Previous'),
1228+ 'next_text' => T_('Next').' &gt;&gt;',
1229+ ) );
1230
1231 // --- --- --- --- --- --- --- --- --- --- ---
1232 // MAIN CONTENT INCLUDED HERE
1233@@ -286,67 +273,65 @@
1234 $Blog_B = & $BlogCache->get_by_ID( 2, false );
1235 if( empty($Blog_B) )
1236 {
1237- echo sprintf( T_('Blog #%d doesn\'t seem to exist.'), 2 );
1238+ echo sprintf( T_('Blog #%d doesn\'t seem to exist.'), 2 );
1239 }
1240 else
1241 {
1242- ?>
1243-
1244- <h3>#2: <a href="<?php $Blog_B->disp( 'blogurl', 'raw' ) ?>"><?php echo $Blog_B->disp( 'name', 'htmlbody' ) ?></a></h3>
1245- <?php
1246- $BlogBList = & new ItemList2( $Blog_B, $timestamp_min, $timestamp_max, $posts );
1247-
1248- $BlogBList->set_filters( array(
1249- 'authors' => $author,
1250- 'ymdhms' => $m,
1251- 'week' => $w,
1252- 'order' => $order,
1253- 'orderby' => $orderby,
1254- 'unit' => $unit,
1255- ) );
1256-
1257- // Run the query:
1258- $BlogBList->query();
1259-
1260- while( $Item = & $BlogBList->get_item() )
1261- {
1262- ?>
1263- <div id="<?php $Item->anchor_id() ?>" class="bPostSide bPostSide<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
1264-
1265- <h4 class="bTitle">
1266- <?php
1267- $Item->permanent_link( array(
1268- 'text' => '#icon#',
1269- ) );
1270- ?>
1271- <?php $Item->title(); ?>
1272- </h4>
1273- <div class="bText">
1274- <?php
1275- // Display CONTENT (teaser only):
1276- $Item->content_teaser( array(
1277- 'before' => '',
1278- 'after' => '',
1279- 'disppage' => 1,
1280- 'stripteaser' => false,
1281- ) );
1282- ?>
1283- </div>
1284- </div>
1285- <?php
1286- }
1287+ ?>
1288+
1289+ <h3>#2: <a href="<?php $Blog_B->disp( 'blogurl', 'raw' ) ?>"><?php echo $Blog_B->disp( 'name', 'htmlbody' ) ?></a></h3>
1290+ <?php
1291+ $BlogBList = & new ItemList2( $Blog_B, $timestamp_min, $timestamp_max, $posts );
1292+
1293+ $BlogBList->set_filters( array(
1294+ 'authors' => $author,
1295+ 'ymdhms' => $m,
1296+ 'week' => $w,
1297+ 'order' => $order,
1298+ 'orderby' => $orderby,
1299+ 'unit' => $unit,
1300+ ) );
1301+
1302+ // Run the query:
1303+ $BlogBList->query();
1304+
1305+ while( $Item = & $BlogBList->get_item() )
1306+ {
1307+ ?>
1308+ <div id="<?php $Item->anchor_id() ?>" class="bPostSide bPostSide<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
1309+
1310+ <h4 class="bTitle">
1311+ <?php
1312+ $Item->permanent_link( array(
1313+ 'text' => '#icon#',
1314+ ) );
1315+ ?>
1316+ <?php $Item->title(); ?>
1317+ </h4>
1318+ <div class="bText">
1319+ <?php
1320+ // Display CONTENT (teaser only):
1321+ $Item->content_teaser( array(
1322+ 'before' => '',
1323+ 'after' => '',
1324+ 'disppage' => 1,
1325+ 'stripteaser' => false,
1326+ ) );
1327+ ?>
1328+ </div>
1329+ </div>
1330+ <?php
1331+ }
1332 }
1333 ?>
1334 </div>
1335
1336- <!-- =================================== START OF BLOG C =================================== -->
1337-
1338 <div class="bSideItem">
1339 <?php
1340 $Blog_roll = & $BlogCache->get_by_ID( 3, false );
1341 if( empty($Blog_roll) )
1342 {
1343- echo sprintf( T_('Blog #%d doesn\'t seem to exist.'), 3 );
1344+ echo sprintf( T_('Blog #%d doesn\'t seem to exist.'), 3 );
1345 }
1346 else
1347 {
1348@@ -356,73 +341,74 @@
1349 $LinkblogList = & new ItemList2( $Blog_roll, $timestamp_min, $timestamp_max, $posts );
1350
1351 $LinkblogList->set_filters( array(
1352- 'authors' => $author,
1353- 'ymdhms' => $m,
1354- 'week' => $w,
1355- 'order' => $order,
1356- 'orderby' => $orderby,
1357- 'unit' => $unit,
1358- ) );
1359+ 'authors' => $author,
1360+ 'ymdhms' => $m,
1361+ 'week' => $w,
1362+ 'order' => $order,
1363+ 'orderby' => $orderby,
1364+ 'unit' => $unit,
1365+ ) );
1366
1367 // Run the query:
1368 $LinkblogList->query();
1369
1370 while( $Item = & $LinkblogList->get_item() )
1371 {
1372- ?>
1373- <div id="<?php $Item->anchor_id() ?>" class="bPostSide bPostSide<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
1374- <h4 class="bTitle">
1375- <?php
1376- $Item->permanent_link( array(
1377- 'text' => '#icon#',
1378- ) );
1379- ?>
1380- <?php $Item->title(); ?>
1381- </h4>
1382- <div class="bText">
1383- <?php
1384- // Display CONTENT (teaser only):
1385- $Item->content_teaser( array(
1386- 'before' => '',
1387- 'after' => '',
1388- 'disppage' => 1,
1389- 'stripteaser' => false,
1390- ) );
1391- ?>
1392- </div>
1393- </div>
1394- <?php
1395+ ?>
1396+ <div id="<?php $Item->anchor_id() ?>" class="bPostSide bPostSide<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
1397+ <h4 class="bTitle">
1398+ <?php
1399+ $Item->permanent_link( array(
1400+ 'text' => '#icon#',
1401+ ) );
1402+ ?>
1403+ <?php $Item->title(); ?>
1404+ </h4>
1405+ <div class="bText">
1406+ <?php
1407+ // Display CONTENT (teaser only):
1408+ $Item->content_teaser( array(
1409+ 'before' => '',
1410+ 'after' => '',
1411+ 'disppage' => 1,
1412+ 'stripteaser' => false,
1413+ ) );
1414+ ?>
1415+ </div>
1416+ </div>
1417+ <?php
1418 }
1419 }
1420 ?>
1421 </div>
1422
1423- <!-- =================================== END OF BLOG C =================================== -->
1424-
1425 <div class="bSideItem">
1426 <h3><?php echo T_('Misc') ?></h3>
1427 <ul>
1428- <?php
1429- // Administrative links:
1430- user_login_link( '<li>', '</li>' );
1431- user_register_link( '<li>', '</li>' );
1432- user_admin_link( '<li>', '</li>' );
1433- user_profile_link( '<li>', '</li>' );
1434- user_subs_link( '<li>', '</li>' );
1435- user_logout_link( '<li>', '</li>' );
1436- ?>
1437+ <?php
1438+ // Administrative links:
1439+ user_login_link( '<li>', '</li>' );
1440+ user_register_link( '<li>', '</li>' );
1441+ user_admin_link( '<li>', '</li>' );
1442+ user_profile_link( '<li>', '</li>' );
1443+ user_subs_link( '<li>', '</li>' );
1444+ user_logout_link( '<li>', '</li>' );
1445+ ?>
1446 </ul>
1447- </div>
1448-
1449-</div>
1450-<!-- InstanceEndEditable --></div>
1451+</div>
1452+
1453+</div>
1454+
1455+</div>
1456+
1457 <div class="footer">
1458 This is a demo page for <a href="<?php echo $app_homepage; ?>"><?php echo $app_name; ?></a>.
1459-<!-- InstanceBeginEditable name="Baseline" -->
1460 <?php echo '</div>' ?>
1461-<!-- Note: don't mess with the template here :/ --><!-- InstanceEndEditable --></div>
1462+
1463+</div>
1464+
1465 </body>
1466-<!-- InstanceEnd --></html>
1467+</html>
1468 <?php
1469 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
1470 // Save collected cached data if needed:
1471
1472=== added file 'rsc/icons/fileicons/avi.png'
1473Binary files rsc/icons/fileicons/avi.png 1970-01-01 00:00:00 +0000 and rsc/icons/fileicons/avi.png 2010-01-09 20:22:17 +0000 differ
1474=== added file 'rsc/icons/fileicons/css.png'
1475Binary files rsc/icons/fileicons/css.png 1970-01-01 00:00:00 +0000 and rsc/icons/fileicons/css.png 2010-01-09 20:22:17 +0000 differ
1476=== added file 'rsc/icons/fileicons/m4a.png'
1477Binary files rsc/icons/fileicons/m4a.png 1970-01-01 00:00:00 +0000 and rsc/icons/fileicons/m4a.png 2010-01-09 20:22:17 +0000 differ
1478=== added file 'rsc/icons/fileicons/mov.png'
1479Binary files rsc/icons/fileicons/mov.png 1970-01-01 00:00:00 +0000 and rsc/icons/fileicons/mov.png 2010-01-09 20:22:17 +0000 differ
1480=== added file 'rsc/icons/fileicons/mp3.png'
1481Binary files rsc/icons/fileicons/mp3.png 1970-01-01 00:00:00 +0000 and rsc/icons/fileicons/mp3.png 2010-01-09 20:22:17 +0000 differ
1482=== added file 'rsc/icons/fileicons/mp4.png'
1483Binary files rsc/icons/fileicons/mp4.png 1970-01-01 00:00:00 +0000 and rsc/icons/fileicons/mp4.png 2010-01-09 20:22:17 +0000 differ
1484=== added file 'rsc/icons/fileicons/pls.png'
1485Binary files rsc/icons/fileicons/pls.png 1970-01-01 00:00:00 +0000 and rsc/icons/fileicons/pls.png 2010-01-09 20:22:17 +0000 differ
1486=== removed file 'rsc/icons/fileicons/video.png'
1487Binary files rsc/icons/fileicons/video.png 2005-01-15 19:18:45 +0000 and rsc/icons/fileicons/video.png 1970-01-01 00:00:00 +0000 differ
1488=== added file 'rsc/icons/fileicons/wmv.png'
1489Binary files rsc/icons/fileicons/wmv.png 1970-01-01 00:00:00 +0000 and rsc/icons/fileicons/wmv.png 2010-01-09 20:22:17 +0000 differ
1490=== added file 'rsc/icons/png/video.png'
1491Binary files rsc/icons/png/video.png 1970-01-01 00:00:00 +0000 and rsc/icons/png/video.png 2010-01-09 20:22:17 +0000 differ
1492=== modified file 'summary.php'
1493--- summary.php 2010-01-04 17:32:41 +0000
1494+++ summary.php 2010-01-09 20:22:17 +0000
1495@@ -10,12 +10,14 @@
1496 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
1497 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
1498 *
1499+ * @todo EdB: this file needs to one day move to /templates/
1500+ *
1501 * @package templates
1502 */
1503
1504 /**
1505- * Check this: we are requiring _main.inc.php INSTEAD of _blog_main.inc.php because we are not
1506- * trying to initialize any particular blog
1507+ * Check this: we are requiring _main.inc.php INSTEAD of _blog_main.inc.php
1508+ * because we are not trying to initialize any particular blog
1509 */
1510 require_once dirname(__FILE__).'/conf/_config.php';
1511
1512@@ -26,26 +28,22 @@
1513
1514 load_funcs( 'templates/_template.funcs.php' );
1515
1516-
1517 // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
1518-// Note: This is totally optional. General caching must be enabled in Global settings, otherwise this will do nothing.
1519-// Delete this block if you don't care about page level caching. Don't forget to delete the matching section at the end of the page.
1520+// Note: This is totally optional. General caching must be enabled in Global settings,
1521+// otherwise this will do nothing. Delete this block if you don't care about page-level
1522+// caching. Don't forget to delete the matching section at the end of the page.
1523 load_class( '_core/model/_pagecache.class.php' );
1524 $PageCache = & new PageCache( NULL );
1525-// Check for cached content & Start caching if needed:
1526+
1527+// check for cached content & start caching if needed
1528 if( ! $PageCache->check() )
1529-{ // Cache miss, we have to generate:
1530- // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
1531-
1532-
1533-add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
1534-
1535+{
1536+add_js_for_toolbar(); // Registers all the javascripts needed by the toolbar menu
1537 header_content_type( 'text/html' );
1538 ?>
1539 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
1540-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>"><!-- InstanceBegin template="/Templates/Standard.dwt" codeOutsideHTMLIsLocked="false" -->
1541+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
1542 <head>
1543-<!-- InstanceBeginEditable name="doctitle" -->
1544 <title><?php echo T_('Summary Demo'); ?></title>
1545 <link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />
1546 <?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
1547@@ -70,110 +68,97 @@
1548
1549 <div class="pageHeader">
1550 <?php
1551- // --------------------------------- START OF BLOG LIST --------------------------------
1552- template_widget( array(
1553- // CODE for the widget:
1554- 'widget' => 'colls_list_public',
1555- // Optional display params
1556- 'block_start' => '<div class="NavBar">',
1557- 'block_end' => '</div>',
1558- 'block_display_title' => false,
1559- 'list_start' => '',
1560- 'list_end' => '',
1561- 'item_start' => '',
1562- 'item_end' => '',
1563- 'item_selected_start' => '',
1564- 'item_selected_end' => '',
1565- 'link_selected_class' => 'NavButton2',
1566- 'link_default_class' => 'NavButton2',
1567- ) );
1568- // ---------------------------------- END OF BLOG LIST ---------------------------------
1569+// display the Public Blog List widget
1570+template_widget( array(
1571+ 'widget' => 'colls_list_public',
1572+ // block-level params...
1573+ 'block_start' => '<div class="NavBar">',
1574+ 'block_end' => '</div>',
1575+ 'block_display_title' => false,
1576+ // list params...
1577+ 'list_start' => '',
1578+ 'list_end' => '',
1579+ 'item_start' => '',
1580+ 'item_end' => '',
1581+ 'item_selected_start' => '',
1582+ 'item_selected_end' => '',
1583+ // miscellaneous params...
1584+ 'link_selected_class' => 'NavButton2',
1585+ 'link_default_class' => 'NavButton2',
1586+) );
1587 ?>
1588-<!-- InstanceEndEditable -->
1589+
1590 <div class="pageTitle">
1591-<h1 id="pageTitle"><!-- InstanceBeginEditable name="PageTitle" --><?php echo T_('Summary Demo') ?><!-- InstanceEndEditable --></h1>
1592-</div>
1593-</div>
1594-
1595-
1596-<div class="pageSubTitle"><!-- InstanceBeginEditable name="SubTitle" --><?php echo T_('This demo template displays a summary of last posts in all blogs') ?><!-- InstanceEndEditable --></div>
1597-
1598-
1599-<div class="main"><!-- InstanceBeginEditable name="Main" -->
1600-
1601-<!-- =================================== START OF MAIN AREA =================================== -->
1602-
1603-
1604-<?php // --------------------------- BLOG LIST -----------------------------
1605-
1606+<h1 id="pageTitle"><?php echo T_('Summary Demo') ?></h1>
1607+</div>
1608+
1609+</div>
1610+
1611+<div class="pageSubTitle"><?php echo T_('This demo template displays a summary of last posts in all blogs') ?></div>
1612+
1613+<div class="main">
1614+<?php
1615 load_class('items/model/_itemlist.class.php');
1616-
1617 $BlogCache = & get_Cache( 'BlogCache' );
1618-
1619 $blog_array = $BlogCache->load_public( 'ID' );
1620-
1621- foreach( $blog_array as $blog )
1622- { // Loop through all public blogs:
1623- # by uncommenting the following lines you can hide some blogs
1624- // if( $blog == 2 ) continue; // Hide blog 2...
1625-
1626- /**
1627- * @var Blog
1628- */
1629- $l_Blog = & $BlogCache->get_by_ID( $blog );
1630-
1631- ?>
1632- <h3><a href="<?php echo $l_Blog->gen_blogurl(); ?>" title="<?php $l_Blog->disp( 'shortdesc', 'htmlattr' ); ?>"><?php $l_Blog->disp( 'name', 'htmlattr' ); ?></a></h3>
1633- <ul>
1634- <?php // Get the 3 last posts for each blog:
1635-
1636- $BlogBList = & new ItemList2( $l_Blog, NULL, 'now', 3 );
1637-
1638- $BlogBList->set_filters( array(
1639- 'order' => 'DESC',
1640- 'unit' => 'posts',
1641- ) );
1642-
1643- // Run the query:
1644- $BlogBList->query();
1645-
1646- while( $Item = & $BlogBList->get_item() )
1647- {
1648- ?>
1649- <li lang="<?php $Item->lang() ?>">
1650- <?php
1651- $Item->issue_date( array(
1652- 'before' => ' ',
1653- 'after' => ' ',
1654- 'date_format' => '#',
1655- ) );
1656-
1657- $Item->title( array(
1658- 'link_type' => 'permalink',
1659- ) );
1660- ?>
1661- <span class="small">[<?php $Item->lang() ?>]</span>
1662- </li>
1663- <?php
1664- }
1665- ?>
1666- <li><a href="<?php echo $l_Blog->gen_blogurl(); ?>"><?php echo T_('More posts...') ?></a></li>
1667- </ul>
1668+// loop through all public blogs
1669+foreach( $blog_array as $blog )
1670+{
1671+ # by uncommenting the following lines you can hide some blogs
1672+ // if( $blog == 2 ) continue; // Hide blog 2...
1673+
1674+ /**
1675+ * @var Blog
1676+ */
1677+ $l_Blog = & $BlogCache->get_by_ID( $blog );
1678+ ?>
1679+ <h3><a href="<?php echo $l_Blog->gen_blogurl(); ?>" title="<?php $l_Blog->disp( 'shortdesc', 'htmlattr' ); ?>"><?php $l_Blog->disp( 'name', 'htmlattr' ); ?></a></h3>
1680+ <ul>
1681+ <?php
1682+ // get the 3 last posts for each blog
1683+ $BlogBList = & new ItemList2( $l_Blog, NULL, 'now', 3 );
1684+ $BlogBList->set_filters( array(
1685+ 'order' => 'DESC',
1686+ 'unit' => 'posts',
1687+ ) );
1688+ $BlogBList->query();
1689+
1690+ while( $Item = & $BlogBList->get_item() )
1691+ {
1692+ ?>
1693+ <li lang="<?php $Item->lang() ?>">
1694+ <?php
1695+ $Item->issue_date( array(
1696+ 'before' => ' ',
1697+ 'after' => ' ',
1698+ 'date_format' => '#',
1699+ ) );
1700+
1701+ $Item->title( array(
1702+ 'link_type' => 'permalink',
1703+ ) );
1704+ ?>
1705+ <span class="small">[<?php $Item->lang() ?>]</span>
1706+ </li>
1707 <?php
1708 }
1709- // ---------------------------------- END OF BLOG LIST --------------------------------- ?>
1710-<!-- InstanceEndEditable --></div>
1711+ ?>
1712+ <li><a href="<?php echo $l_Blog->gen_blogurl(); ?>"><?php echo T_('More posts...') ?></a></li>
1713+ </ul>
1714+ <?php
1715+}
1716+?>
1717+</div>
1718+
1719 <div class="footer">
1720 This is a demo page for <a href="<?php echo $app_homepage; ?>"><?php echo $app_name; ?></a>.
1721-<!-- InstanceBeginEditable name="Baseline" -->
1722 <?php echo '</div>' ?>
1723-<!-- InstanceEndEditable --></div>
1724+</div>
1725+
1726 </body>
1727-<!-- InstanceEnd --></html>
1728+</html>
1729 <?php
1730- // --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
1731- // Save collected cached data if needed:
1732+// save collected cached data (if needed)
1733 $PageCache->end_collect();
1734 }
1735-// --------------------- PAGE LEVEL CACHING SUPPORT ---------------------
1736 ?>
1737
1738=== modified file 'templates/_404_not_found.disp.php'
1739--- templates/_404_not_found.disp.php 2010-01-02 08:34:34 +0000
1740+++ templates/_404_not_found.disp.php 2010-01-09 20:22:17 +0000
1741@@ -10,38 +10,36 @@
1742 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
1743 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
1744 *
1745+ * @todo EdB: tag cloud widget here? admin-configurable would be better
1746+ * @todo EdB: line 27ish needs translatability, line 30ish needs understanding/testing/explaining
1747+ *
1748 * @package templates
1749 */
1750 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1751
1752 global $disp_detail, $baseurl, $app_name;
1753-
1754-echo '<div class="error_404">';
1755-
1756-echo '<h2>404 Not Found</h2>';
1757-
1758-echo '<p><a href="'.$baseurl.'">'.$app_name.'</a> cannot resolve the requested URL.</p>';
1759-
1760-// You may use this to further customize this page:
1761+?>
1762+
1763+<div class="error_404">
1764+<h2>404 Not Found</h2>
1765+<p><?php
1766+echo '<a href="'.$baseurl.'">'.$app_name.'</a> cannot resolve the requested URL.</p>';
1767+
1768+// uncomment this to further customize this page:
1769 // echo $disp_detail;
1770-
1771-echo '</div>';
1772-
1773-
1774-echo '<div class="error_additional_content">';
1775-// --------------------------------- START OF CLOUD TAG --------------------------------
1776-// Call the coll_search_form widget:
1777+?>
1778+</div>
1779+
1780+<div class="error_additional_content">
1781+<?php
1782+// display the Tag Cloud widget
1783 template_widget( array(
1784- // CODE for the widget:
1785- 'widget' => 'coll_tag_cloud',
1786- // Optional display params:
1787- 'block_start' => '<div class="tag_cloud">',
1788- 'block_end' => '</div>',
1789- 'block_title_start' => '<h2>',
1790- 'block_title_end' => '</h2>',
1791- ) );
1792-// ---------------------------------- END OF CLOUD TAG ---------------------------------
1793-echo '</div>';
1794-
1795-
1796-?>
1797\ No newline at end of file
1798+ 'widget' => 'coll_tag_cloud',
1799+ // block-level params...
1800+ 'block_start' => '<div class="tag_cloud">',
1801+ 'block_end' => '</div>',
1802+ 'block_title_start' => '<h2>',
1803+ 'block_title_end' => '</h2>',
1804+) );
1805+?>
1806+</div>
1807
1808=== modified file 'templates/_arcdir.disp.php'
1809--- templates/_arcdir.disp.php 2009-12-21 17:27:20 +0000
1810+++ templates/_arcdir.disp.php 2010-01-09 20:22:17 +0000
1811@@ -16,12 +16,12 @@
1812 */
1813 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1814
1815-// Call the Archives plugin WITH NO LIMIT & NO MORE LINK:
1816-$Plugins->call_by_code( 'evo_Arch', array( 'title'=>'',
1817- 'block_start'=>'',
1818- 'block_end'=>'',
1819- 'limit'=>'',
1820- 'more_link'=>'' ) );
1821-
1822-
1823-?>
1824\ No newline at end of file
1825+// display the Archives plugin (if installed)
1826+$Plugins->call_by_code( 'evo_Arch', array(
1827+ 'title' => '',
1828+ 'block_start' => '',
1829+ 'block_end' => '',
1830+ 'limit' => '',
1831+ 'more_link' => '',
1832+) );
1833+?>
1834
1835=== modified file 'templates/_atom/comments.main.php'
1836--- templates/_atom/comments.main.php 2009-12-12 16:12:01 +0000
1837+++ templates/_atom/comments.main.php 2010-01-09 20:22:21 +0000
1838@@ -11,12 +11,12 @@
1839
1840
1841 if( isset($Item) )
1842-{ // Comments for a specific Item:
1843+{ // Comments for a specific Item:
1844 $CommentList = & new CommentList( $Blog, "'comment'", array('published'), $Item->ID,
1845 '', 'DESC', '', $Blog->get_setting('posts_per_feed') );
1846 }
1847 else
1848-{ // Comments for the blog:
1849+{ // Comments for the blog:
1850 $CommentList = & new CommentList( $Blog, "'comment'", array('published'), '',
1851 '', 'DESC', '', $Blog->get_setting('posts_per_feed') );
1852 }
1853@@ -40,11 +40,10 @@
1854 'title_before'=> ' - ',
1855 'title_after' => '',
1856 'title_none' => '',
1857- 'glue' => ' - ',
1858+ 'glue' => ' - ',
1859 'title_single_disp' => true,
1860- 'format' => 'xml',
1861+ 'format' => 'xml',
1862 ) );
1863- // ------------------------------ END OF REQUEST TITLE -----------------------------
1864 ?></title>
1865 <link rel="alternate" type="text/html" href="<?php $Blog->disp( 'lastcommentsurl', 'xml' ) ?>" />
1866 <link rel="self" type="application/atom+xml" href="<?php $Blog->disp( 'comments_atom_url', 'xmlattr' ) ?>" />
1867@@ -61,12 +60,12 @@
1868 'format' => 'xml',
1869 'link_type' => 'none',
1870 ) ); ?></title>
1871- <link rel="alternate" type="text/html" href="<?php $Comment->permanent_url() ?>" />
1872+ <link rel="alternate" type="text/html" href="<?php $Comment->permanent_url(); ?>" />
1873 <author>
1874 <name><?php $Comment->author( '', '#', '', '#', 'xml' ) ?></name>
1875 <?php $Comment->author_url( '', '<uri>', "</uri>\n", false ) ?>
1876 </author>
1877- <id><?php $Comment->permanent_url() ?></id>
1878+ <id><?php $Comment->permanent_url(); ?></id>
1879 <published><?php $Comment->date( 'isoZ', true ); ?></published>
1880 <updated><?php $Comment->date( 'isoZ', true ); ?></updated>
1881 <content type="html"><![CDATA[<?php echo make_rel_links_abs( $Comment->get_content() ); ?>]]></content>
1882
1883=== modified file 'templates/_atom/index.main.php'
1884--- templates/_atom/index.main.php 2009-12-12 16:12:01 +0000
1885+++ templates/_atom/index.main.php 2010-01-09 20:22:21 +0000
1886@@ -26,7 +26,7 @@
1887 // What level of detail do we want?
1888 $feed_content = $Blog->get_setting('feed_content');
1889 if( $feed_content == 'none' )
1890-{ // We don't want to provide this feed!
1891+{ // We don't want to provide this feed!
1892 // This will normaly have been detected earlier but just for security:
1893 debug_die( 'Feeds are disabled.');
1894 }
1895@@ -50,9 +50,9 @@
1896 'title_before'=> ' - ',
1897 'title_after' => '',
1898 'title_none' => '',
1899- 'glue' => ' - ',
1900+ 'glue' => ' - ',
1901 'title_single_disp' => true,
1902- 'format' => 'xml',
1903+ 'format' => 'xml',
1904 ) );
1905 // ------------------------------ END OF REQUEST TITLE -----------------------------
1906 ?></title>
1907@@ -64,7 +64,7 @@
1908 <updated><?php echo gmdate('Y-m-d\TH:i:s\Z'); ?></updated>
1909 <?php
1910 while( $Item = & mainlist_get_item() )
1911- { // For each blog post, do everything below up to the closing curly brace "}"
1912+ { // For each blog post, do everything below up to the closing curly brace "}"
1913 // Load Item's creator User:
1914 $Item->get_creator_User();
1915 ?>
1916@@ -96,86 +96,84 @@
1917 <id><?php $Item->permanent_url( 'single' ) ?></id>
1918 <?php
1919 $Item->issue_date( array(
1920- 'before' => '<published>',
1921- 'after' => '</published>',
1922+ 'before' => '<published>',
1923+ 'after' => '</published>',
1924 'date_format' => 'isoZ',
1925- 'use_GMT' => true,
1926+ 'use_GMT' => true,
1927 ) );
1928 ?>
1929 <updated><?php $Item->mod_date( 'isoZ', true ) ?></updated>
1930 <?php
1931 if( $feed_content == 'excerpt' )
1932- { // EXCERPTS ---------------------------------------------------------------------
1933+ { // EXCERPTS ---------------------------------------------------------------------
1934 ?>
1935 <content type="html"><![CDATA[<?php
1936 $content = $Item->get_excerpt( 'entityencoded' );
1937
1938- // fp> this is another one of these "oooooh it's just a tiny little change"
1939- // and "we only need to make the links absolute in RSS"
1940- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
1941- // TODO: clean solution : work in format_to_output!
1942+ /**
1943+ * @todo (legacy): clean solution : work in format_to_output!
1944+ */
1945 echo make_rel_links_abs( $content );
1946
1947 // Display Item footer text (text can be edited in Blog Settings):
1948 $Item->footer( array(
1949- 'mode' => 'xml',
1950+ 'mode' => 'xml',
1951 'block_start' => '<div class="item_footer">',
1952- 'block_end' => '</div>',
1953- 'format' => 'htmlbody',
1954+ 'block_end' => '</div>',
1955+ 'format' => 'htmlbody',
1956 ) );
1957 ?>]]></content>
1958 <?php
1959 }
1960 elseif( $feed_content == 'normal'
1961 || $feed_content == 'full' )
1962- { // POST CONTENTS -----------------------------------------------------------------
1963+ { // POST CONTENTS -----------------------------------------------------------------
1964 ?>
1965 <content type="html"><![CDATA[<?php
1966 // URL link, if the post has one:
1967 $Item->url_link( array(
1968- 'before' => '<p>',
1969- 'after' => '</p>',
1970- 'podcast' => false,
1971+ 'before' => '<p>',
1972+ 'after' => '</p>',
1973+ 'podcast' => false,
1974 ) );
1975
1976 // Display images that are linked to this post:
1977 $content = $Item->get_images( array(
1978- 'before' => '<div>',
1979- 'before_image' => '<div>',
1980+ 'before' => '<div>',
1981+ 'before_image' => '<div>',
1982 'before_image_legend' => '<div><i>',
1983 'after_image_legend' => '</i></div>',
1984- 'after_image' => '</div>',
1985- 'after' => '</div>',
1986- 'image_size' => 'fit-320x320'
1987+ 'after_image' => '</div>',
1988+ 'after' => '</div>',
1989+ 'image_size' => 'fit-320x320'
1990 ), 'htmlbody' );
1991
1992 $content .= $Item->get_content_teaser( 1, false );
1993
1994 if( $feed_content == 'normal' )
1995- { // Teasers only
1996+ { // Teasers only
1997 $content .= $Item->get_more_link( array(
1998- 'before' => '',
1999- 'after' => '',
2000+ 'before' => '',
2001+ 'after' => '',
2002 'disppage' => 1,
2003 ) );
2004 }
2005 else
2006- { // Full contents
2007+ { // Full contents
2008 $content .= $Item->get_content_extension( 1, true );
2009 }
2010
2011- // fp> this is another one of these "oooooh it's just a tiny little change"
2012- // and "we only need to make the links absolute in RSS"
2013- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
2014- // TODO: clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
2015+ /**
2016+ * @todo (legacy): clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
2017+ */
2018 echo make_rel_links_abs( $content );
2019
2020 // Display Item footer text (text can be edited in Blog Settings):
2021 $Item->footer( array(
2022- 'mode' => 'xml',
2023+ 'mode' => 'xml',
2024 'block_start' => '<div class="item_footer">',
2025- 'block_end' => '</div>',
2026- 'format' => 'htmlbody',
2027+ 'block_end' => '</div>',
2028+ 'format' => 'htmlbody',
2029 ) );
2030 ?>]]></content>
2031 <?php
2032
2033=== modified file 'templates/_body_footer.inc.php'
2034--- templates/_body_footer.inc.php 2009-12-12 16:12:01 +0000
2035+++ templates/_body_footer.inc.php 2010-01-09 20:22:17 +0000
2036@@ -4,8 +4,6 @@
2037 *
2038 * This is meant to be included in a page template.
2039 *
2040- * -at- tutorial page placeholder _body_footer.inc.php
2041- *
2042 * @package templates
2043 */
2044 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2045@@ -16,9 +14,9 @@
2046 <?php
2047 // Display a link to contact the owner of this blog (if owner accepts messages):
2048 $Blog->contact_link( array(
2049- 'before' => '',
2050- 'after' => ' &bull; ',
2051- 'text' => T_('Contact'),
2052+ 'before' => '',
2053+ 'after' => ' &bull; ',
2054+ 'text' => T_('Contact'),
2055 'title' => T_('Send a message to the owner of this blog...'),
2056 ) );
2057 ?>
2058
2059=== modified file 'templates/_body_header.inc.php'
2060--- templates/_body_header.inc.php 2009-12-12 16:12:01 +0000
2061+++ templates/_body_header.inc.php 2010-01-09 20:22:17 +0000
2062@@ -4,8 +4,6 @@
2063 *
2064 * This is meant to be included in a page template.
2065 *
2066- * -at- tutorial page placeholder _body_header.inc.php
2067- *
2068 * @package templates
2069 */
2070 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2071@@ -13,4 +11,4 @@
2072
2073 // By default, this does nothing. It's just here as a placeholder.
2074
2075-?>
2076\ No newline at end of file
2077+?>
2078
2079=== modified file 'templates/_catdir.disp.php'
2080--- templates/_catdir.disp.php 2010-01-02 08:34:34 +0000
2081+++ templates/_catdir.disp.php 2010-01-09 20:22:17 +0000
2082@@ -16,16 +16,12 @@
2083 */
2084 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2085
2086-// --------------------------------- START OF CATEGORY LIST --------------------------------
2087+// display the Category List widget
2088 template_widget( array(
2089- // CODE for the widget:
2090- 'widget' => 'coll_category_list',
2091- // Optional display params
2092- 'block_start' => '',
2093- 'block_end' => '',
2094- 'block_display_title' => false,
2095+ 'widget' => 'coll_category_list',
2096+ // block-level params...
2097+ 'block_start' => '',
2098+ 'block_end' => '',
2099+ 'block_display_title' => false,
2100 ) );
2101-// ---------------------------------- END OF CATEGORY LIST ---------------------------------
2102-
2103-
2104-?>
2105\ No newline at end of file
2106+?>
2107
2108=== modified file 'templates/_comments.disp.php'
2109--- templates/_comments.disp.php 2009-12-21 17:27:20 +0000
2110+++ templates/_comments.disp.php 2010-01-09 20:22:17 +0000
2111@@ -25,9 +25,7 @@
2112 { // Loop through comments:
2113 // Load comment's Item object:
2114 $Comment->get_Item();
2115- ?>
2116- <!-- ========== START of a COMMENT ========== -->
2117- <?php $Comment->anchor() ?>
2118+ $Comment->anchor(); ?>
2119 <div class="bComment">
2120 <h3 class="bTitle">
2121 <?php echo T_('In response to:') ?>
2122@@ -36,20 +34,20 @@
2123 ) ); ?>
2124 </h3>
2125 <div class="bCommentTitle">
2126- <?php $Comment->author() ?>
2127+ <?php $Comment->author(); ?>
2128 <?php $Comment->author_url( '', ' &middot; ', '' ) ?>
2129 </div>
2130 <div class="bCommentText">
2131- <?php $Comment->content() ?>
2132+ <?php $Comment->content(); ?>
2133 </div>
2134 <div class="bCommentSmallPrint">
2135 <?php
2136 $Comment->permanent_link( array(
2137- 'class' => 'permalink_right',
2138+ 'class' => 'permalink_right',
2139 'nofollow' => true,
2140 ) );
2141 ?>
2142- <?php $Comment->date() ?> @ <?php $Comment->time( 'H:i' ) ?>
2143+ <?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?>
2144 <?php $Comment->edit_link( ' &middot; ' ) /* Link to backoffice for editing */ ?>
2145 <?php $Comment->delete_link( ' &middot; ' ); /* Link to backoffice for deleting */ ?>
2146 </div>
2147
2148=== modified file 'templates/_html_footer.inc.php'
2149--- templates/_html_footer.inc.php 2010-01-02 08:34:34 +0000
2150+++ templates/_html_footer.inc.php 2010-01-09 20:22:17 +0000
2151@@ -5,8 +5,6 @@
2152 * This is meant to be included in a page template.
2153 * Note: This is also included in the popup: do not include site navigation!
2154 *
2155- * -at- tutorial page placeholder _html_footer.inc.php
2156- *
2157 * @package templates
2158 */
2159 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2160@@ -14,8 +12,7 @@
2161 // Trigger plugin event, which could be used e.g. by a google_analytics plugin to add the javascript snippet here:
2162 $Plugins->trigger_event('TemplateEndHtmlBody');
2163 ?>
2164-
2165 </div>
2166
2167 </body>
2168-</html>
2169\ No newline at end of file
2170+</html>
2171
2172=== modified file 'templates/_html_header.inc.php'
2173--- templates/_html_header.inc.php 2010-01-02 15:13:47 +0000
2174+++ templates/_html_header.inc.php 2010-01-09 20:22:17 +0000
2175@@ -16,7 +16,7 @@
2176 header_content_type(); // Sets charset!
2177 ?>
2178 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2179-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang() ?>" lang="<?php locale_lang() ?>">
2180+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php locale_lang(); ?>" lang="<?php locale_lang(); ?>">
2181 <head>
2182 <?php template_content_meta(); /* Charset for static pages */ ?>
2183 <?php template_base_tag(); /* Base URL for this template. You need this to fix relative links! */ ?>
2184@@ -24,9 +24,8 @@
2185 <title><?php
2186 // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
2187 request_title( array(
2188- 'auto_pilot' => 'seo_title',
2189+ 'auto_pilot' => 'seo_title',
2190 ) );
2191- // ------------------------------ END OF REQUEST TITLE -----------------------------
2192 ?></title>
2193 <?php template_description_tag(); ?>
2194 <?php template_keywords_tag(); ?>
2195
2196=== modified file 'templates/_item_comment.inc.php'
2197--- templates/_item_comment.inc.php 2009-12-21 17:27:20 +0000
2198+++ templates/_item_comment.inc.php 2010-01-09 20:22:17 +0000
2199@@ -13,23 +13,18 @@
2200 */
2201 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2202
2203-
2204 // Default params:
2205 $params = array_merge( array(
2206- 'comment_start' => '<div class="bComment">',
2207- 'comment_end' => '</div>',
2208- 'Comment' => NULL, // This object MUST be passed as a param!
2209+ 'comment_start' => '<div class="bComment">',
2210+ 'comment_end' => '</div>',
2211+ 'Comment' => NULL, // This object MUST be passed as a param!
2212 ), $params );
2213
2214 /**
2215 * @var Comment
2216 */
2217 $Comment = & $params['Comment'];
2218-
2219-?>
2220-<!-- ========== START of a COMMENT/TB/PB ========== -->
2221-<?php
2222- $Comment->anchor();
2223+$Comment->anchor();
2224 echo $params['comment_start'];
2225 ?>
2226 <div class="bCommentTitle">
2227@@ -38,14 +33,14 @@
2228 {
2229 case 'comment': // Display a comment:
2230 if( empty($Comment->ID) )
2231- { // PREVIEW comment
2232+ { // PREVIEW comment
2233 echo T_('PREVIEW Comment from:').' ';
2234 }
2235 else
2236- { // Normal comment
2237+ { // Normal comment
2238 $Comment->permanent_link( array(
2239- 'before' => '',
2240- 'after' => ' '.T_('from:').' ',
2241+ 'before' => '',
2242+ 'after' => ' '.T_('from:').' ',
2243 'text' => T_('Comment'),
2244 'nofollow' => true,
2245 ) );
2246@@ -57,8 +52,8 @@
2247
2248 case 'trackback': // Display a trackback:
2249 $Comment->permanent_link( array(
2250- 'before' => '',
2251- 'after' => ' '.T_('from:').' ',
2252+ 'before' => '',
2253+ 'after' => ' '.T_('from:').' ',
2254 'text' => T_('Trackback'),
2255 'nofollow' => true,
2256 ) );
2257@@ -67,8 +62,8 @@
2258
2259 case 'pingback': // Display a pingback:
2260 $Comment->permanent_link( array(
2261- 'before' => '',
2262- 'after' => ' '.T_('from:').' ',
2263+ 'before' => '',
2264+ 'after' => ' '.T_('from:').' ',
2265 'text' => T_('Pingback'),
2266 'nofollow' => true,
2267 ) );
2268@@ -79,7 +74,7 @@
2269 </div>
2270 <?php $Comment->rating(); ?>
2271 <div class="bCommentText">
2272- <?php $Comment->content() ?>
2273+ <?php $Comment->content(); ?>
2274 </div>
2275 <div class="bCommentSmallPrint">
2276 <?php
2277@@ -87,7 +82,7 @@
2278 $Comment->delete_link( '', '', '#', '#', 'permalink_right' ); /* Link to backoffice for deleting */
2279 ?>
2280
2281- <?php $Comment->date() ?> @ <?php $Comment->time( 'H:i' ) ?>
2282+ <?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?>
2283 </div>
2284 <?php
2285 echo $params['comment_end'];
2286
2287=== modified file 'templates/_item_comment_form.inc.php'
2288--- templates/_item_comment_form.inc.php 2010-01-02 15:13:47 +0000
2289+++ templates/_item_comment_form.inc.php 2010-01-09 20:22:17 +0000
2290@@ -20,15 +20,15 @@
2291
2292 // Default params:
2293 $params = array_merge( array(
2294- 'disp_comment_form' => true,
2295- 'form_title_start' => '<h3>',
2296- 'form_title_end' => '</h3>',
2297- 'policy_text' => '',
2298- 'textarea_lines' => 10,
2299- 'default_text' => '',
2300- 'preview_start' => '<div class="bComment" id="comment_preview">',
2301- 'comment_template' => '_item_comment.inc.php',
2302- 'preview_end' => '</div>',
2303+ 'disp_comment_form' => true,
2304+ 'form_title_start' => '<h3>',
2305+ 'form_title_end' => '</h3>',
2306+ 'policy_text' => '',
2307+ 'textarea_lines' => 10,
2308+ 'default_text' => '',
2309+ 'preview_start' => '<div class="bComment" id="comment_preview">',
2310+ 'comment_template' => '_item_comment.inc.php',
2311+ 'preview_end' => '</div>',
2312 ), $params );
2313
2314 /*
2315@@ -39,7 +39,7 @@
2316
2317 // INIT/PREVIEW:
2318 if( $Comment = $Session->get('core.preview_Comment') )
2319- { // We have a comment to preview
2320+ { // We have a comment to preview
2321 if( $Comment->item_ID == $Item->ID )
2322 { // display PREVIEW:
2323
2324@@ -69,9 +69,9 @@
2325 { // New comment:
2326 $Comment = & new Comment();
2327 if( $PageCache->is_collecting )
2328- { // This page is going into the cache, we don't want personal data cached!!!
2329+ { // This page is going into the cache, we don't want personal data cached!!!
2330 // fp> These fields should be filled out locally with Javascript tapping directly into the cookies. Anyone JS savvy enough to do that?
2331- $comment_author = '';
2332+ $comment_author = '';
2333 $comment_author_email = '';
2334 $comment_author_url = '';
2335 }
2336@@ -82,7 +82,7 @@
2337 $comment_author_url = isset($_COOKIE[$cookie_url]) ? trim($_COOKIE[$cookie_url]) : '';
2338 }
2339 if( empty($comment_author_url) )
2340- { // Even if we have a blank cookie, let's reset this to remind the bozos what it's for
2341+ { // Even if we have a blank cookie, let's reset this to remind the bozos what it's for
2342 $comment_author_url = 'http://';
2343 }
2344
2345@@ -91,7 +91,7 @@
2346
2347
2348 if( $PageCache->is_collecting )
2349- { // This page is going into the cache, we don't want personal data cached!!!
2350+ { // This page is going into the cache, we don't want personal data cached!!!
2351 // fp> These fields should be filled out locally with Javascript tapping directly into the cookies. Anyone JS savvy enough to do that?
2352 }
2353 else
2354@@ -114,18 +114,22 @@
2355 $Form = & new Form( $htsrv_url.'comment_post.php', 'bComment_form_id_'.$Item->ID, 'post' );
2356 $Form->begin_form( 'bComment', '', array( 'target' => '_self' ) );
2357
2358- // TODO: dh> a plugin hook would be useful here to add something to the top of the Form.
2359- // Actually, the best would be, if the $Form object could be changed by a plugin
2360- // before display!
2361+ /**
2362+ * @todo (legacy): dh> a plugin hook would be useful here to add something to the top of the Form.
2363+ * Actually, the best would be, if the $Form object could be changed by a plugin
2364+ * before display!
2365+ */
2366
2367 $Form->hidden( 'comment_post_ID', $Item->ID );
2368 $Form->hidden( 'redirect_to',
2369 // Make sure we get back to the right page (on the right domain)
2370- // fp> TODO: check if we can use the permalink instead but we must check that application wide,
2371- // that is to say: check with the comments in a pop-up etc...
2372- // url_rel_to_same_host(regenerate_url( '', '', $Blog->get('blogurl'), '&' ), $htsrv_url)
2373- // fp> what we need is a regenerate_url that will work in permalinks
2374- // fp> below is a simpler approach:
2375+ /**
2376+ * @todo (legacy): fp> check if we can use the permalink instead but we must check that application wide,
2377+ * that is to say: check with the comments in a pop-up etc...
2378+ * url_rel_to_same_host(regenerate_url( '', '', $Blog->get('blogurl'), '&' ), $htsrv_url)
2379+ * fp> what we need is a regenerate_url that will work in permalinks
2380+ * fp> below is a simpler approach:
2381+ */
2382 $Item->get_feedback_url( $disp == 'feedback-popup', '&' )
2383 );
2384
2385@@ -143,14 +147,14 @@
2386 }
2387
2388 if( $Item->can_rate() )
2389- { // Comment rating:
2390+ { // Comment rating:
2391 echo $Form->begin_field( NULL, T_('Your vote'), true );
2392 $Comment->rating_input();
2393 echo $Form->end_field();
2394 }
2395
2396 if( !empty($params['policy_text']) )
2397- { // We have a policy text to display
2398+ { // We have a policy text to display
2399 $Form->info_field( '', $params['policy_text'] );
2400 }
2401
2402@@ -182,12 +186,16 @@
2403 $comment_options[] = '<label><input type="checkbox" class="checkbox" name="comment_cookies" tabindex="7"'
2404 .( $comment_cookies ? ' checked="checked"' : '' ).' value="1" /> '.T_('Remember me').'</label>'
2405 .' <span class="note">('.T_('Name, email &amp; website').')</span>';
2406- // TODO: If we got info from cookies, Add a link called "Forget me now!" (without posting a comment).
2407+ /**
2408+ * @todo (legacy): If we got info from cookies, Add a link called "Forget me now!" (without posting a comment).
2409+ */
2410
2411 $comment_options[] = '<label><input type="checkbox" class="checkbox" name="comment_allow_msgform" tabindex="8"'
2412 .( $comment_allow_msgform ? ' checked="checked"' : '' ).' value="1" /> '.T_('Allow message form').'</label>'
2413 .' <span class="note">('.T_('Allow users to contact you through a message form (your email will <strong>not</strong> be revealed.').')</span>';
2414- // TODO: If we have an email in a cookie, Add links called "Add a contact icon to all my previous comments" and "Remove contact icon from all my previous comments".
2415+ /**
2416+ * @todo (legacy): If we have an email in a cookie, Add links called "Add a contact icon to all my previous comments" and "Remove contact icon from all my previous comments".
2417+ */
2418 }
2419
2420 if( ! empty($comment_options) )
2421
2422=== modified file 'templates/_item_comment_wp.inc.php'
2423--- templates/_item_comment_wp.inc.php 2009-12-21 17:27:20 +0000
2424+++ templates/_item_comment_wp.inc.php 2010-01-09 20:22:17 +0000
2425@@ -13,31 +13,26 @@
2426 */
2427 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2428
2429-
2430 // Default params:
2431 $params = array_merge( array(
2432- 'comment_start' => '<li>',
2433- 'comment_end' => '</li>',
2434- 'preview_start' => '<ul><li id="comment_preview">',
2435- 'preview_end' => '</li></ul>',
2436- 'Comment' => NULL, // This object MUST be passed as a param!
2437+ 'comment_start' => '<li>',
2438+ 'comment_end' => '</li>',
2439+ 'preview_start' => '<ul><li id="comment_preview">',
2440+ 'preview_end' => '</li></ul>',
2441+ 'Comment' => NULL, // This object MUST be passed as a param!
2442 ), $params );
2443
2444 /**
2445 * @var Comment
2446 */
2447 $Comment = & $params['Comment'];
2448-
2449-?>
2450-<!-- ========== START of a COMMENT/TB/PB ========== -->
2451-<?php
2452- $Comment->anchor();
2453+$Comment->anchor();
2454 echo $params['comment_start'];
2455 ?>
2456
2457 <?php $Comment->rating(); ?>
2458
2459-<?php $Comment->content() ?>
2460+<?php $Comment->content(); ?>
2461
2462 <p><cite>
2463 <?php
2464@@ -45,14 +40,14 @@
2465 {
2466 case 'comment': // Display a comment:
2467 if( empty($Comment->ID) )
2468- { // PREVIEW comment
2469+ { // PREVIEW comment
2470 echo T_('PREVIEW Comment by').' ';
2471 }
2472 else
2473- { // Normal comment
2474+ { // Normal comment
2475 $Comment->permanent_link( array(
2476- 'before' => '',
2477- 'after' => ' '.T_('by').' ',
2478+ 'before' => '',
2479+ 'after' => ' '.T_('by').' ',
2480 'text' => T_('Comment'),
2481 'nofollow' => true,
2482 ) );
2483@@ -64,8 +59,8 @@
2484
2485 case 'trackback': // Display a trackback:
2486 $Comment->permanent_link( array(
2487- 'before' => '',
2488- 'after' => ' '.T_('by').' ',
2489+ 'before' => '',
2490+ 'after' => ' '.T_('by').' ',
2491 'text' => T_('Trackback'),
2492 'nofollow' => true,
2493 ) );
2494@@ -74,8 +69,8 @@
2495
2496 case 'pingback': // Display a pingback:
2497 $Comment->permanent_link( array(
2498- 'before' => '',
2499- 'after' => ' '.T_('by').' ',
2500+ 'before' => '',
2501+ 'after' => ' '.T_('by').' ',
2502 'text' => T_('Pingback'),
2503 'nofollow' => true,
2504 ) );
2505@@ -84,7 +79,7 @@
2506 }
2507 ?>
2508 &#8212;
2509- <?php $Comment->date() ?> @ <?php $Comment->time( 'H:i' ) ?>
2510+ <?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?>
2511 </cite>
2512
2513 <?php
2514
2515=== modified file 'templates/_item_content.inc.php'
2516--- templates/_item_content.inc.php 2009-12-21 17:27:20 +0000
2517+++ templates/_item_content.inc.php 2010-01-09 20:22:17 +0000
2518@@ -19,43 +19,44 @@
2519
2520 // Default params:
2521 $params = array_merge( array(
2522- 'content_mode' => 'auto', // Can be 'excerpt', 'normal' or 'full'. 'auto' will auto select depending on backoffice SEO settings for $disp-detail
2523- 'intro_mode' => 'auto', // same as above. This will typically be forced to "normal" when displaying an intro section so that intro posts always display as normal there
2524- 'force_more' => false, // This will be set to true id 'content_mode' resolves to 'full'.
2525+ 'content_mode' => 'auto', // Can be 'excerpt', 'normal' or 'full'. 'auto' will auto select depending on backoffice SEO settings for $disp-detail
2526+ 'intro_mode' => 'auto', // same as above. This will typically be forced to "normal" when displaying an intro section so that intro posts always display as normal there
2527+ 'force_more' => false, // This will be set to true id 'content_mode' resolves to 'full'.
2528 'content_start_excerpt' => '<div class="content_excerpt">',
2529 'content_end_excerpt' => '</div>',
2530 'content_start_full' => '<div class="content_full">',
2531- 'content_end_full' => '</div>',
2532- 'before_images' => '<div class="bImages">',
2533- 'before_image' => '<div class="image_block">',
2534+ 'content_end_full' => '</div>',
2535+ 'before_images' => '<div class="bImages">',
2536+ 'before_image' => '<div class="image_block">',
2537 'before_image_legend' => '<div class="image_legend">',
2538 'after_image_legend' => '</div>',
2539- 'after_image' => '</div>',
2540- 'after_images' => '</div>',
2541- 'image_size' => 'fit-400x320',
2542+ 'after_image' => '</div>',
2543+ 'after_images' => '</div>',
2544+ 'image_size' => 'fit-400x320',
2545 'excerpt_image_size' => 'fit-80x80',
2546- 'before_url_link' => '<p class="post_link">'.T_('Link:').' ',
2547- 'after_url_link' => '</p>',
2548+ 'before_url_link' => '<p class="post_link">'.T_('Link:').' ',
2549+ 'after_url_link' => '</p>',
2550 'url_link_text_template' => '$url$',
2551- 'before_more_link' => '<p class="bMore">',
2552- 'after_more_link' => '</p>',
2553- 'more_link_text' => '#',
2554+ 'before_more_link' => '<p class="bMore">',
2555+ 'after_more_link' => '</p>',
2556+ 'more_link_text' => '#',
2557 'excerpt_before_text' => '<div class="excerpt">',
2558 'excerpt_after_text' => '</div>',
2559 'excerpt_before_more' => ' <span class="excerpt_more">',
2560 'excerpt_after_more' => '</span>',
2561- 'excerpt_more_text' => T_('more').' &raquo;',
2562- // fp> todo: rename 'files' to 'attach' (as in attachments)
2563- 'limit_files' => 1000,
2564- 'file_list_start' => '<div class="attchments"><h3>'.T_('Attachments').':</h3><ul>',
2565- 'file_list_end' => '</ul></div>',
2566- 'file_start' => '<li>',
2567- 'file_end' => '</li>',
2568- 'before_file_size' => ' <span class="file_size">',
2569- 'after_file_size' => '</span>',
2570+ 'excerpt_more_text' => T_('more').' &raquo;',
2571+ /**
2572+ * @todo (legacy): fp> todo: rename 'files' to 'attach' (as in attachments)
2573+ */
2574+ 'limit_files' => 1000,
2575+ 'file_list_start' => '<div class="attchments"><h3>'.T_('Attachments').':</h3><ul>',
2576+ 'file_list_end' => '</ul></div>',
2577+ 'file_start' => '<li>',
2578+ 'file_end' => '</li>',
2579+ 'before_file_size' => ' <span class="file_size">',
2580+ 'after_file_size' => '</span>',
2581 ), $params );
2582
2583-
2584 // Determine content mode to use..
2585 if( $Item->is_intro() )
2586 {
2587@@ -105,23 +106,23 @@
2588 {
2589 // Display images that are linked to this post:
2590 $Item->images( array(
2591- 'before' => $params['before_images'],
2592- 'before_image' => $params['before_image'],
2593+ 'before' => $params['before_images'],
2594+ 'before_image' => $params['before_image'],
2595 'before_image_legend' => $params['before_image_legend'],
2596 'after_image_legend' => $params['after_image_legend'],
2597- 'after_image' => $params['after_image_legend'],
2598- 'after' => $params['after_images'],
2599+ 'after_image' => $params['after_image_legend'],
2600+ 'after' => $params['after_images'],
2601 'image_size' => $params['excerpt_image_size'],
2602- 'image_link_to' => 'single',
2603+ 'image_link_to' => 'single',
2604 ) );
2605 }
2606
2607 $Item->excerpt( array(
2608- 'before' => $params['excerpt_before_text'],
2609- 'after' => $params['excerpt_after_text'],
2610+ 'before' => $params['excerpt_before_text'],
2611+ 'after' => $params['excerpt_after_text'],
2612 'excerpt_before_more' => $params['excerpt_before_more'],
2613 'excerpt_after_more' => $params['excerpt_after_more'],
2614- 'excerpt_more_text' => $params['excerpt_more_text'],
2615+ 'excerpt_more_text' => $params['excerpt_more_text'],
2616 ) );
2617
2618 echo $params['content_end_excerpt'];
2619@@ -144,13 +145,13 @@
2620 {
2621 // Display images that are linked to this post:
2622 $Item->images( array(
2623- 'before' => $params['before_images'],
2624- 'before_image' => $params['before_image'],
2625+ 'before' => $params['before_images'],
2626+ 'before_image' => $params['before_image'],
2627 'before_image_legend' => $params['before_image_legend'],
2628 'after_image_legend' => $params['after_image_legend'],
2629- 'after_image' => $params['after_image_legend'],
2630- 'after' => $params['after_images'],
2631- 'image_size' => $params['image_size'],
2632+ 'after_image' => $params['after_image_legend'],
2633+ 'after' => $params['after_images'],
2634+ 'image_size' => $params['image_size'],
2635 ) );
2636 }
2637
2638@@ -160,28 +161,28 @@
2639
2640 // URL link, if the post has one:
2641 $Item->url_link( array(
2642- 'before' => $params['before_url_link'],
2643- 'after' => $params['after_url_link'],
2644+ 'before' => $params['before_url_link'],
2645+ 'after' => $params['after_url_link'],
2646 'text_template' => $params['url_link_text_template'],
2647 'url_template' => '$url$',
2648- 'target' => '',
2649- 'podcast' => '#', // auto display mp3 player if post type is podcast (=> false, to disable)
2650+ 'target' => '',
2651+ 'podcast' => '#', // auto display mp3 player if post type is podcast (=> false, to disable)
2652 ) );
2653
2654 // Display CONTENT:
2655 $Item->content_teaser( array(
2656- 'before' => '',
2657- 'after' => '',
2658+ 'before' => '',
2659+ 'after' => '',
2660 ) );
2661 $Item->more_link( array(
2662 'force_more' => $params['force_more'],
2663- 'before' => $params['before_more_link'],
2664- 'after' => $params['after_more_link'],
2665- 'link_text' => $params['more_link_text'],
2666+ 'before' => $params['before_more_link'],
2667+ 'after' => $params['after_more_link'],
2668+ 'link_text' => $params['more_link_text'],
2669 ) );
2670 $Item->content_extension( array(
2671- 'before' => '',
2672- 'after' => '',
2673+ 'before' => '',
2674+ 'after' => '',
2675 'force_more' => $params['force_more'],
2676 ) );
2677
2678@@ -190,9 +191,9 @@
2679
2680 // Display Item footer text (text can be edited in Blog Settings):
2681 $Item->footer( array(
2682- 'mode' => '#', // Will detect 'single' from $disp automatically
2683+ 'mode' => '#', // Will detect 'single' from $disp automatically
2684 'block_start' => '<div class="item_footer">',
2685- 'block_end' => '</div>',
2686+ 'block_end' => '</div>',
2687 ) );
2688 ?>
2689 </div>
2690@@ -200,15 +201,15 @@
2691
2692
2693 if( !empty($params['limit_files']) )
2694- { // Display attachments/files that are linked to this post:
2695+ { // Display attachments/files that are linked to this post:
2696 $Item->files( array(
2697- 'before' => $params['file_list_start'],
2698- 'before_file' => $params['file_start'],
2699- 'before_file_size' => $params['before_file_size'],
2700- 'after_file_size' => $params['after_file_size'],
2701- 'after_file' => $params['file_end'],
2702- 'after' => $params['file_list_end'],
2703- 'limit_files' => $params['limit_files'],
2704+ 'before' => $params['file_list_start'],
2705+ 'before_file' => $params['file_start'],
2706+ 'before_file_size' => $params['before_file_size'],
2707+ 'after_file_size' => $params['after_file_size'],
2708+ 'after_file' => $params['file_end'],
2709+ 'after' => $params['file_list_end'],
2710+ 'limit_files' => $params['limit_files'],
2711 ) );
2712 }
2713
2714
2715=== modified file 'templates/_item_feedback.inc.php'
2716--- templates/_item_feedback.inc.php 2010-01-02 15:13:47 +0000
2717+++ templates/_item_feedback.inc.php 2010-01-09 20:22:17 +0000
2718@@ -23,52 +23,51 @@
2719
2720 // Default params:
2721 $params = array_merge( array(
2722- 'disp_comments' => true,
2723- 'disp_comment_form' => true,
2724- 'disp_trackbacks' => true,
2725- 'disp_trackback_url' => true,
2726- 'disp_pingbacks' => true,
2727+ 'disp_comments' => true,
2728+ 'disp_comment_form' => true,
2729+ 'disp_trackbacks' => true,
2730+ 'disp_trackback_url' => true,
2731+ 'disp_pingbacks' => true,
2732 'before_section_title' => '<h3>',
2733 'after_section_title' => '</h3>',
2734- 'comment_list_start' => "\n\n",
2735- 'comment_list_end' => "\n\n",
2736- 'comment_start' => '<div class="bComment">',
2737- 'comment_end' => '</div>',
2738- 'preview_start' => '<div class="bComment" id="comment_preview">',
2739- 'preview_end' => '</div>',
2740- 'comment_template' => '_item_comment.inc.php',
2741- 'form_title_start' => '<h3>',
2742- 'form_title_end' => '</h3>',
2743+ 'comment_list_start' => "\n\n",
2744+ 'comment_list_end' => "\n\n",
2745+ 'comment_start' => '<div class="bComment">',
2746+ 'comment_end' => '</div>',
2747+ 'preview_start' => '<div class="bComment" id="comment_preview">',
2748+ 'preview_end' => '</div>',
2749+ 'comment_template' => '_item_comment.inc.php',
2750+ 'form_title_start' => '<h3>',
2751+ 'form_title_end' => '</h3>',
2752 ), $params );
2753
2754
2755 global $c, $tb, $pb;
2756
2757-
2758 if( ! $Item->can_see_comments() )
2759-{ // Comments are disabled for this post
2760+{ // Comments are disabled for this post
2761 return;
2762 }
2763
2764 if( empty($c) )
2765-{ // Comments not requested
2766+{ // Comments not requested
2767 $params['disp_comments'] = false; // DO NOT Display the comments if not requested
2768 $params['disp_comment_form'] = false; // DO NOT Display the comments form if not requested
2769 }
2770
2771 if( empty($tb) || !$Blog->get( 'allowtrackbacks' ) )
2772-{ // Trackback not requested or not allowed
2773+{ // Trackback not requested or not allowed
2774 $params['disp_trackbacks'] = false; // DO NOT Display the trackbacks if not requested
2775 $params['disp_trackback_url'] = false; // DO NOT Display the trackback URL if not requested
2776 }
2777
2778 if( empty($pb) )
2779-{ // Pingback not requested
2780+{ // Pingback not requested
2781 $params['disp_pingbacks'] = false; // DO NOT Display the pingbacks if not requested
2782 }
2783
2784 if( ! ($params['disp_comments'] || $params['disp_comment_form'] || $params['disp_trackbacks'] || $params['disp_trackback_url'] || $params['disp_pingbacks'] ) )
2785-{ // Nothing more to do....
2786+{ // Nothing more to do....
2787 return false;
2788 }
2789
2790@@ -78,7 +77,7 @@
2791 $disp_title = array();
2792
2793 if( $params['disp_comments'] )
2794-{ // We requested to display comments
2795+{ // We requested to display comments
2796 if( $Item->can_see_comments() )
2797 { // User can see a comments
2798 $type_list[] = "'comment'";
2799@@ -134,7 +133,7 @@
2800 if( $params['disp_comments'] || $params['disp_trackbacks'] || $params['disp_pingbacks'] )
2801 {
2802 if( empty($disp_title) )
2803- { // No title yet
2804+ { // No title yet
2805 if( $title = $Item->get_feedback_title( 'feedbacks', '', T_('Feedback awaiting moderation'), T_('Feedback awaiting moderation'), 'draft' ) )
2806 { // We have some feedback awaiting moderation: we'll want to show that in the title
2807 $disp_title[] = $title;
2808@@ -142,7 +141,7 @@
2809 }
2810
2811 if( empty($disp_title) )
2812- { // Still no title
2813+ { // Still no title
2814 $disp_title[] = T_('No feedback yet');
2815 }
2816
2817@@ -176,7 +175,10 @@
2818
2819 // foo?
2820 if( $Blog->get_setting( 'feed_content' ) != 'none' )
2821- { // fp: TODO; move this tesqt into feedback_feed_link()
2822+ {
2823+ /**
2824+ * @todo (legacy): fp: move this tesqt into feedback_feed_link()
2825+ */
2826 // Display link for comments feed:
2827 $Item->feedback_feed_link( '_rss2', '<div class="feedback_feed_msg"><p>', '</p></div>' );
2828
2829@@ -187,4 +189,4 @@
2830 // --- --- --- --- --- --- --- --- --- --- ---
2831 // --- COMMENT FORM INCLUDED HERE ---
2832 template_include( '_item_comment_form.inc.php', $params );
2833-?>
2834\ No newline at end of file
2835+?>
2836
2837=== modified file 'templates/_mediaidx.disp.php'
2838--- templates/_mediaidx.disp.php 2010-01-02 08:34:34 +0000
2839+++ templates/_mediaidx.disp.php 2010-01-09 20:22:21 +0000
2840@@ -16,28 +16,25 @@
2841 */
2842 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2843
2844-// --------------------------------- START OF MEDIA INDEX --------------------------------
2845+// display the Media Index widget
2846 template_widget( array(
2847- // CODE for the widget:
2848- 'widget' => 'coll_media_index',
2849- // Optional display params
2850- 'block_start' => '',
2851- 'block_end' => '',
2852- 'block_display_title' => false,
2853- 'thumb_size' => 'fit-80x80',
2854- 'thumb_layout' => 'grid',
2855- 'grid_start' => '<table class="image_index" cellspacing="3">',
2856- 'grid_end' => '</table>',
2857- 'grid_nb_cols' => 8,
2858- 'grid_colstart' => '<tr>',
2859- 'grid_colend' => '</tr>',
2860- 'grid_cellstart' => '<td>',
2861- 'grid_cellend' => '</td>',
2862- 'order_by' => $Blog->get_setting('orderby'),
2863- 'order_dir' => $Blog->get_setting('orderdir'),
2864- 'limit' => 1000,
2865+ 'widget' => 'coll_media_index',
2866+ // block-level params...
2867+ 'block_start' => '',
2868+ 'block_end' => '',
2869+ 'block_display_title' => false,
2870+ // widget-specific params...
2871+ 'thumb_size' => 'fit-80x80',
2872+ 'thumb_layout' => 'grid',
2873+ 'grid_start' => '<table class="image_index" cellspacing="3">',
2874+ 'grid_end' => '</table>',
2875+ 'grid_nb_cols' => 8,
2876+ 'grid_colstart' => '<tr>',
2877+ 'grid_colend' => '</tr>',
2878+ 'grid_cellstart' => '<td>',
2879+ 'grid_cellend' => '</td>',
2880+ 'order_by' => $Blog->get_setting('orderby'),
2881+ 'order_dir' => $Blog->get_setting('orderdir'),
2882+ 'limit' => 1000,
2883 ) );
2884-// ---------------------------------- END OF MEDIA INDEX ---------------------------------
2885-
2886-
2887-?>
2888\ No newline at end of file
2889+?>
2890
2891=== modified file 'templates/_msgform.disp.php'
2892--- templates/_msgform.disp.php 2009-12-21 17:27:20 +0000
2893+++ templates/_msgform.disp.php 2010-01-09 20:22:21 +0000
2894@@ -13,9 +13,9 @@
2895 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
2896 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
2897 *
2898- * @todo dh> A user/blog might want to accept only mails from logged in users (fp>yes!)
2899- * @todo dh> For logged in users the From name and address should be not editable/displayed
2900- * (the same as when commenting). (fp>yes!!!)
2901+ * @todo (legacy): dh> A user/blog might want to accept only mails from logged in users (fp>yes!)
2902+ * @todo (legacy): dh> For logged in users the From name and address should be not editable/displayed
2903+ * (the same as when commenting). (fp>yes!!!)
2904 *
2905 * @package templates
2906 */
2907@@ -26,9 +26,9 @@
2908 global $DB;
2909
2910 // Parameters
2911-/* TODO: dh> params should get remembered, e.g. if somebody clicks on the
2912- * login/logout link from the msgform page.
2913- * BUT, for the logout link remembering it here is too late normally.. :/
2914+/* @todo (legacy): dh> params should get remembered, e.g. if somebody clicks on the
2915+ * login/logout link from the msgform page.
2916+ * BUT, for the logout link remembering it here is too late normally.. :/
2917 */
2918 $redirect_to = param( 'redirect_to', 'string', '' ); // pass-through (hidden field)
2919 $recipient_id = param( 'recipient_id', 'integer', '' );
2920@@ -115,7 +115,7 @@
2921 }
2922
2923 if( empty($recipient_address) )
2924-{ // We should never have called this in the first place!
2925+{ // We should never have called this in the first place!
2926 // Could be that commenter did not provide an email, etc...
2927 echo 'No recipient specified!';
2928 return;
2929@@ -130,7 +130,7 @@
2930 SELECT post_title
2931 FROM T_items__item, T_comments
2932 WHERE comment_ID = '.$DB->quote($comment_id).'
2933- AND post_ID = comment_post_ID' );
2934+ AND post_ID = comment_post_ID' );
2935
2936 if( $row )
2937 {
2938@@ -204,4 +204,4 @@
2939 $Form->end_form();
2940
2941
2942-?>
2943\ No newline at end of file
2944+?>
2945
2946=== modified file 'templates/_rdf/comments.main.php'
2947--- templates/_rdf/comments.main.php 2009-12-19 20:28:41 +0000
2948+++ templates/_rdf/comments.main.php 2010-01-09 20:22:21 +0000
2949@@ -11,12 +11,12 @@
2950
2951
2952 if( isset($Item) )
2953-{ // Comments for a specific Item:
2954+{ // Comments for a specific Item:
2955 $CommentList = & new CommentList( $Blog, "'comment'", array('published'), $Item->ID,
2956 '', 'DESC', '', $Blog->get_setting('posts_per_feed') );
2957 }
2958 else
2959-{ // Comments for the blog:
2960+{ // Comments for the blog:
2961 $CommentList = & new CommentList( $Blog, "'comment'", array('published'), '',
2962 '', 'DESC', '', $Blog->get_setting('posts_per_feed') );
2963 }
2964@@ -35,9 +35,9 @@
2965 'title_before'=> ' - ',
2966 'title_after' => '',
2967 'title_none' => '',
2968- 'glue' => ' - ',
2969+ 'glue' => ' - ',
2970 'title_single_disp' => true,
2971- 'format' => 'xml',
2972+ 'format' => 'xml',
2973 ) );
2974 // ------------------------------ END OF REQUEST TITLE -----------------------------
2975 ?></title>
2976@@ -53,7 +53,7 @@
2977 <?php while( $Comment = & $CommentList->get_next() )
2978 { // Loop through comments:
2979 ?>
2980- <rdf:li rdf:resource="<?php $Comment->permanent_url() ?>"/>
2981+ <rdf:li rdf:resource="<?php $Comment->permanent_url(); ?>"/>
2982 <?php
2983 } ?>
2984 </rdf:Seq>
2985@@ -66,12 +66,12 @@
2986 // Load comment's Item:
2987 $Comment->get_Item();
2988 ?>
2989-<item rdf:about="<?php $Comment->permanent_url() ?>">
2990+<item rdf:about="<?php $Comment->permanent_url(); ?>">
2991 <title><?php echo format_to_output( T_('In response to:'), 'xml' ) ?> <?php $Comment->Item->title( array(
2992 'format' => 'xml',
2993 'link_type' => 'none',
2994 ) ); ?></title>
2995- <link><?php $Comment->permanent_url() ?></link>
2996+ <link><?php $Comment->permanent_url(); ?></link>
2997 <dc:date><?php $Comment->date( 'isoZ', true ); ?></dc:date>
2998 <dc:creator><?php $Comment->author( '', '#', '', '#', 'xml' ) ?></dc:creator>
2999 <description><?php echo make_rel_links_abs( $Comment->get_content('entityencoded') ); ?></description>
3000
3001=== modified file 'templates/_rdf/index.main.php'
3002--- templates/_rdf/index.main.php 2009-12-19 20:28:41 +0000
3003+++ templates/_rdf/index.main.php 2010-01-09 20:22:21 +0000
3004@@ -17,7 +17,7 @@
3005 // What level of detail do we want?
3006 $feed_content = $Blog->get_setting('feed_content');
3007 if( $feed_content == 'none' )
3008-{ // We don't want to provide this feed!
3009+{ // We don't want to provide this feed!
3010 // This will normaly have been detected earlier but just for security:
3011 debug_die( 'Feeds are disabled.');
3012 }
3013@@ -38,9 +38,9 @@
3014 'title_before'=> ' - ',
3015 'title_after' => '',
3016 'title_none' => '',
3017- 'glue' => ' - ',
3018+ 'glue' => ' - ',
3019 'title_single_disp' => true,
3020- 'format' => 'xml',
3021+ 'format' => 'xml',
3022 ) );
3023 // ------------------------------ END OF REQUEST TITLE -----------------------------
3024 ?></title>
3025@@ -55,7 +55,7 @@
3026 <rdf:Seq>
3027 <?php
3028 while( $Item = & mainlist_get_item() )
3029- { // For each blog post, do everything below up to the closing curly brace "}"
3030+ { // For each blog post, do everything below up to the closing curly brace "}"
3031 ?>
3032 <rdf:li rdf:resource="<?php $Item->permanent_url( 'single' ) ?>"/>
3033 <?php } ?>
3034@@ -65,7 +65,7 @@
3035 <?php
3036 $MainList->restart();
3037 while( $Item = & mainlist_get_item() )
3038-{ // For each blog post, do everything below up to the closing curly brace "}"
3039+{ // For each blog post, do everything below up to the closing curly brace "}"
3040 // Load Item's creator User:
3041 $Item->get_creator_User();
3042 ?>
3043@@ -78,155 +78,151 @@
3044 <link><?php $Item->permanent_url( 'single' ) ?></link>
3045 <?php
3046 $Item->issue_date( array(
3047- 'before' => '<dc:date>',
3048- 'after' => '</dc:date>',
3049+ 'before' => '<dc:date>',
3050+ 'after' => '</dc:date>',
3051 'date_format' => 'isoZ',
3052- 'use_GMT' => true,
3053+ 'use_GMT' => true,
3054 ) );
3055 ?>
3056 <dc:creator><?php $Item->creator_User->preferred_name( 'xml' ) ?></dc:creator>
3057 <dc:subject><?php $Item->main_category( 'xml' ) ?></dc:subject>
3058 <?php
3059 if( $feed_content == 'excerpt' )
3060- { // EXCERPTS ---------------------------------------------------------------------
3061+ { // EXCERPTS ---------------------------------------------------------------------
3062 ?>
3063 <description><?php
3064 $content = $Item->get_excerpt( 'entityencoded' );
3065
3066- // fp> this is another one of these "oooooh it's just a tiny little change"
3067- // and "we only need to make the links absolute in RSS"
3068- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3069- // TODO: clean solution : work in format_to_output!
3070+ /**
3071+ * @todo (legacy): clean solution : work in format_to_output!
3072+ */
3073 echo make_rel_links_abs( $content );
3074
3075 // Display Item footer text (text can be edited in Blog Settings):
3076 $Item->footer( array(
3077- 'mode' => 'xml',
3078+ 'mode' => 'xml',
3079 'block_start' => '<div class="item_footer">',
3080- 'block_end' => '</div>',
3081- 'format' => 'entityencoded',
3082+ 'block_end' => '</div>',
3083+ 'format' => 'entityencoded',
3084 ) );
3085 ?></description>
3086 <content:encoded><![CDATA[<?php
3087 // Display images that are linked to this post:
3088 $content = $Item->get_excerpt( 'htmlbody' );
3089
3090- // fp> this is another one of these "oooooh it's just a tiny little change"
3091- // and "we only need to make the links absolute in RSS"
3092- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3093- // TODO: clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
3094+ /**
3095+ * @todo (legacy): clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
3096+ */
3097 echo make_rel_links_abs( $content );
3098
3099 // Display Item footer text (text can be edited in Blog Settings):
3100 $Item->footer( array(
3101- 'mode' => 'xml',
3102+ 'mode' => 'xml',
3103 'block_start' => '<div class="item_footer">',
3104- 'block_end' => '</div>',
3105- 'format' => 'htmlbody',
3106+ 'block_end' => '</div>',
3107+ 'format' => 'htmlbody',
3108 ) );
3109 ?>]]></content:encoded>
3110 <?php
3111 }
3112 elseif( $feed_content == 'normal'
3113 || $feed_content == 'full' )
3114- { // POST CONTENTS -----------------------------------------------------------------
3115+ { // POST CONTENTS -----------------------------------------------------------------
3116 ?>
3117 <description><?php
3118 // URL link, if the post has one:
3119 $Item->url_link( array(
3120- 'before' => '<p>',
3121- 'after' => '</p>',
3122- 'format' => 'entityencoded',
3123- 'podcast' => false,
3124+ 'before' => '<p>',
3125+ 'after' => '</p>',
3126+ 'format' => 'entityencoded',
3127+ 'podcast' => false,
3128 ) );
3129
3130 // Display images that are linked to this post:
3131 $content = $Item->get_images( array(
3132- 'before' => '<div>',
3133- 'before_image' => '<div>',
3134+ 'before' => '<div>',
3135+ 'before_image' => '<div>',
3136 'before_image_legend' => '<div><i>',
3137 'after_image_legend' => '</i></div>',
3138- 'after_image' => '</div>',
3139- 'after' => '</div>',
3140- 'image_size' => 'fit-320x320'
3141+ 'after_image' => '</div>',
3142+ 'after' => '</div>',
3143+ 'image_size' => 'fit-320x320'
3144 ), 'entityencoded' );
3145
3146 $content .= $Item->get_content_teaser( 1, false, 'entityencoded' );
3147
3148 if( $feed_content == 'normal' )
3149- { // Teasers only
3150+ { // Teasers only
3151 $content .= $Item->get_more_link( array(
3152- 'before' => '',
3153- 'after' => '',
3154+ 'before' => '',
3155+ 'after' => '',
3156 'disppage' => 1,
3157- 'format' => 'entityencoded',
3158+ 'format' => 'entityencoded',
3159 ) );
3160 }
3161 else
3162- { // Full contents
3163+ { // Full contents
3164 $content .= $Item->get_content_extension( 1, true, 'entityencoded' );
3165 }
3166
3167- // fp> this is another one of these "oooooh it's just a tiny little change"
3168- // and "we only need to make the links absolute in RSS"
3169- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3170- // TODO: clean solution : work in format_to_output!
3171+ /**
3172+ * @todo (legacy): clean solution : work in format_to_output!
3173+ */
3174 echo make_rel_links_abs( $content );
3175
3176 // Display Item footer text (text can be edited in Blog Settings):
3177 $Item->footer( array(
3178- 'mode' => 'xml',
3179+ 'mode' => 'xml',
3180 'block_start' => '<div class="item_footer">',
3181- 'block_end' => '</div>',
3182- 'format' => 'entityencoded',
3183+ 'block_end' => '</div>',
3184+ 'format' => 'entityencoded',
3185 ) );
3186 ?></description>
3187 <content:encoded><![CDATA[<?php
3188 // URL link, if the post has one:
3189 $Item->url_link( array(
3190- 'before' => '<p>',
3191- 'after' => '</p>',
3192- 'podcast' => false,
3193+ 'before' => '<p>',
3194+ 'after' => '</p>',
3195+ 'podcast' => false,
3196 ) );
3197
3198 // Display images that are linked to this post:
3199 $content = $Item->get_images( array(
3200- 'before' => '<div>',
3201- 'before_image' => '<div>',
3202+ 'before' => '<div>',
3203+ 'before_image' => '<div>',
3204 'before_image_legend' => '<div><i>',
3205 'after_image_legend' => '</i></div>',
3206- 'after_image' => '</div>',
3207- 'after' => '</div>',
3208- 'image_size' => 'fit-320x320'
3209+ 'after_image' => '</div>',
3210+ 'after' => '</div>',
3211+ 'image_size' => 'fit-320x320'
3212 ), 'htmlbody' );
3213
3214 $content .= $Item->get_content_teaser( 1, false );
3215
3216 if( $feed_content == 'normal' )
3217- { // Teasers only
3218+ { // Teasers only
3219 $content .= $Item->get_more_link( array(
3220- 'before' => '',
3221- 'after' => '',
3222+ 'before' => '',
3223+ 'after' => '',
3224 'disppage' => 1,
3225 ) );
3226 }
3227 else
3228- { // Full contents
3229+ { // Full contents
3230 $content .= $Item->get_content_extension( 1, true );
3231 }
3232
3233- // fp> this is another one of these "oooooh it's just a tiny little change"
3234- // and "we only need to make the links absolute in RSS"
3235- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3236- // TODO: clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
3237+ /**
3238+ * @todo (legacy): clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
3239+ */
3240 echo make_rel_links_abs( $content );
3241
3242 // Display Item footer text (text can be edited in Blog Settings):
3243 $Item->footer( array(
3244- 'mode' => 'xml',
3245+ 'mode' => 'xml',
3246 'block_start' => '<div class="item_footer">',
3247- 'block_end' => '</div>',
3248- 'format' => 'htmlbody',
3249+ 'block_end' => '</div>',
3250+ 'format' => 'htmlbody',
3251 ) );
3252 ?>]]></content:encoded>
3253 <?php
3254
3255=== modified file 'templates/_rss/comments.main.php'
3256--- templates/_rss/comments.main.php 2009-12-12 16:12:01 +0000
3257+++ templates/_rss/comments.main.php 2010-01-09 20:22:21 +0000
3258@@ -11,12 +11,12 @@
3259
3260
3261 if( isset($Item) )
3262-{ // Comments for a specific Item:
3263+{ // Comments for a specific Item:
3264 $CommentList = & new CommentList( $Blog, "'comment'", array('published'), $Item->ID,
3265 '', 'DESC', '', $Blog->get_setting('posts_per_feed') );
3266 }
3267 else
3268-{ // Comments for the blog:
3269+{ // Comments for the blog:
3270 $CommentList = & new CommentList( $Blog, "'comment'", array('published'), '',
3271 '', 'DESC', '', $Blog->get_setting('posts_per_feed') );
3272 }
3273@@ -35,11 +35,10 @@
3274 'title_before'=> ' - ',
3275 'title_after' => '',
3276 'title_none' => '',
3277- 'glue' => ' - ',
3278+ 'glue' => ' - ',
3279 'title_single_disp' => true,
3280- 'format' => 'xml',
3281+ 'format' => 'xml',
3282 ) );
3283- // ------------------------------ END OF REQUEST TITLE -----------------------------
3284 ?></title>
3285 <link><?php $Blog->disp( 'lastcommentsurl', 'xml' ) ?></link>
3286 <description></description>
3287@@ -56,7 +55,7 @@
3288 'link_type' => 'none',
3289 ) ); ?></title>
3290 <description><?php echo make_rel_links_abs( $Comment->get_content('entityencoded') ); ?></description>
3291- <link><?php $Comment->permanent_url() ?></link>
3292+ <link><?php $Comment->permanent_url(); ?></link>
3293 </item>
3294 <?php } // End of comment loop. ?>
3295 </channel>
3296
3297=== modified file 'templates/_rss/index.main.php'
3298--- templates/_rss/index.main.php 2009-12-12 16:12:01 +0000
3299+++ templates/_rss/index.main.php 2010-01-09 20:22:21 +0000
3300@@ -17,7 +17,7 @@
3301 // What level of detail do we want?
3302 $feed_content = $Blog->get_setting('feed_content');
3303 if( $feed_content == 'none' )
3304-{ // We don't want to provide this feed!
3305+{ // We don't want to provide this feed!
3306 // This will normaly have been detected earlier but just for security:
3307 debug_die( 'Feeds are disabled.');
3308 }
3309@@ -38,9 +38,9 @@
3310 'title_before'=> ' - ',
3311 'title_after' => '',
3312 'title_none' => '',
3313- 'glue' => ' - ',
3314+ 'glue' => ' - ',
3315 'title_single_disp' => true,
3316- 'format' => 'xml',
3317+ 'format' => 'xml',
3318 ) );
3319 // ------------------------------ END OF REQUEST TITLE -----------------------------
3320 ?></title>
3321@@ -50,7 +50,7 @@
3322 <docs>http://blogs.law.harvard.edu/tech/rss</docs>
3323 <?php
3324 while( $Item = & mainlist_get_item() )
3325- { // For each blog post, do everything below up to the closing curly brace "}"
3326+ { // For each blog post, do everything below up to the closing curly brace "}"
3327 ?>
3328 <item>
3329 <title><?php $Item->title( array(
3330@@ -59,79 +59,77 @@
3331 ) ); ?></title>
3332 <?php
3333 if( $feed_content == 'excerpt' )
3334- { // EXCERPTS ---------------------------------------------------------------------
3335+ { // EXCERPTS ---------------------------------------------------------------------
3336 ?>
3337 <description><?php
3338 $content = $Item->get_excerpt( 'entityencoded' );
3339
3340- // fp> this is another one of these "oooooh it's just a tiny little change"
3341- // and "we only need to make the links absolute in RSS"
3342- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3343- // TODO: clean solution : work in format_to_output!
3344+ /**
3345+ * @todo (legacy): clean solution : work in format_to_output!
3346+ */
3347 echo make_rel_links_abs( $content );
3348
3349 // Display Item footer text (text can be edited in Blog Settings):
3350 $Item->footer( array(
3351- 'mode' => 'xml',
3352+ 'mode' => 'xml',
3353 'block_start' => '<div class="item_footer">',
3354- 'block_end' => '</div>',
3355- 'format' => 'entityencoded',
3356+ 'block_end' => '</div>',
3357+ 'format' => 'entityencoded',
3358 ) );
3359 ?></description>
3360 <?php
3361 }
3362 elseif( $feed_content == 'normal'
3363 || $feed_content == 'full' )
3364- { // POST CONTENTS -----------------------------------------------------------------
3365+ { // POST CONTENTS -----------------------------------------------------------------
3366 ?>
3367 <description><?php
3368 // URL link, if the post has one:
3369 $Item->url_link( array(
3370- 'before' => '<p>',
3371- 'after' => '</p>',
3372- 'format' => 'entityencoded',
3373- 'podcast' => false,
3374+ 'before' => '<p>',
3375+ 'after' => '</p>',
3376+ 'format' => 'entityencoded',
3377+ 'podcast' => false,
3378 ) );
3379
3380 // Display images that are linked to this post:
3381 $content = $Item->get_images( array(
3382- 'before' => '<div>',
3383- 'before_image' => '<div>',
3384+ 'before' => '<div>',
3385+ 'before_image' => '<div>',
3386 'before_image_legend' => '<div><i>',
3387 'after_image_legend' => '</i></div>',
3388- 'after_image' => '</div>',
3389- 'after' => '</div>',
3390- 'image_size' => 'fit-320x320'
3391+ 'after_image' => '</div>',
3392+ 'after' => '</div>',
3393+ 'image_size' => 'fit-320x320'
3394 ), 'entityencoded' );
3395
3396 $content .= $Item->get_content_teaser( 1, false, 'entityencoded' );
3397
3398 if( $feed_content == 'normal' )
3399- { // Teasers only
3400+ { // Teasers only
3401 $content .= $Item->get_more_link( array(
3402- 'before' => '',
3403- 'after' => '',
3404+ 'before' => '',
3405+ 'after' => '',
3406 'disppage' => 1,
3407- 'format' => 'entityencoded',
3408+ 'format' => 'entityencoded',
3409 ) );
3410 }
3411 else
3412- { // Full contents
3413+ { // Full contents
3414 $content .= $Item->get_content_extension( 1, true, 'entityencoded' );
3415 }
3416
3417- // fp> this is another one of these "oooooh it's just a tiny little change"
3418- // and "we only need to make the links absolute in RSS"
3419- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3420- // TODO: clean solution : work in format_to_output!
3421+ /**
3422+ * @todo (legacy): clean solution : work in format_to_output!
3423+ */
3424 echo make_rel_links_abs( $content );
3425
3426 // Display Item footer text (text can be edited in Blog Settings):
3427 $Item->footer( array(
3428- 'mode' => 'xml',
3429+ 'mode' => 'xml',
3430 'block_start' => '<div class="item_footer">',
3431- 'block_end' => '</div>',
3432- 'format' => 'entityencoded',
3433+ 'block_end' => '</div>',
3434+ 'format' => 'entityencoded',
3435 ) );
3436 ?></description>
3437 <link><?php $Item->permanent_url( 'single' ) ?></link>
3438
3439=== modified file 'templates/_rss2/comments.main.php'
3440--- templates/_rss2/comments.main.php 2009-12-19 20:28:41 +0000
3441+++ templates/_rss2/comments.main.php 2010-01-09 20:22:21 +0000
3442@@ -11,13 +11,13 @@
3443
3444
3445 if( isset($Item) )
3446-{ // Comments for a specific Item:
3447+{ // Comments for a specific Item:
3448 $CommentList = & new CommentList( $Blog, "'comment'", array('published'), $Item->ID,
3449 '', 'DESC', '', $Blog->get_setting('posts_per_feed') );
3450 $selfurl = format_to_output( $Item->get_feedback_feed_url( '_rss2' ), 'xmlattr' );
3451 }
3452 else
3453-{ // Comments for the blog:
3454+{ // Comments for the blog:
3455 $CommentList = & new CommentList( $Blog, "'comment'", array('published'), '',
3456 '', 'DESC', '', $Blog->get_setting('posts_per_feed') );
3457 $selfurl = format_to_output( $Blog->get_comment_feed_url( '_rss2' ), 'xmlattr' );
3458@@ -38,11 +38,10 @@
3459 'title_before'=> ' - ',
3460 'title_after' => '',
3461 'title_none' => '',
3462- 'glue' => ' - ',
3463+ 'glue' => ' - ',
3464 'title_single_disp' => true,
3465- 'format' => 'xml',
3466+ 'format' => 'xml',
3467 ) );
3468- // ------------------------------ END OF REQUEST TITLE -----------------------------
3469 ?></title>
3470 <link><?php $Blog->disp( 'lastcommentsurl', 'xml' ) ?></link>
3471 <atom:link rel="self" type="application/rss+xml" href="<?php echo $selfurl; ?>" />
3472@@ -66,10 +65,10 @@
3473 'xml' ); ?></title>
3474 <pubDate><?php $Comment->time( 'r', true ); ?></pubDate>
3475 <dc:creator><?php $Comment->author( '', '#', '', '#', 'xml' ); ?></dc:creator>
3476- <guid isPermaLink="false">c<?php $Comment->ID() ?>@<?php echo $baseurl ?></guid>
3477+ <guid isPermaLink="false">c<?php $Comment->ID(); ?>@<?php echo $baseurl ?></guid>
3478 <description><?php echo make_rel_links_abs( $Comment->get_content('entityencoded') ); ?></description>
3479 <content:encoded><![CDATA[<?php echo make_rel_links_abs( $Comment->get_content() ); ?>]]></content:encoded>
3480- <link><?php $Comment->permanent_url() ?></link>
3481+ <link><?php $Comment->permanent_url(); ?></link>
3482 </item>
3483 <?php
3484 } /* End of comment loop. */
3485
3486=== modified file 'templates/_rss2/index.main.php'
3487--- templates/_rss2/index.main.php 2009-12-19 20:28:41 +0000
3488+++ templates/_rss2/index.main.php 2010-01-09 20:22:21 +0000
3489@@ -12,7 +12,6 @@
3490 */
3491 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
3492
3493-
3494 // EXTERNAL FEED PROVIDER?
3495 $rss2_redirect = $Blog->get_setting( 'rss2_redirect' );
3496 if ( ! empty( $rss2_redirect ) && empty( $Chapter ) && $redir == 'yes' )
3497@@ -21,7 +20,6 @@
3498 exit( 0 );
3499 }
3500
3501-
3502 // Note: even if we request the same post as $Item earlier, the following will do more restrictions (dates, etc.)
3503 // Init the MainList object:
3504 init_MainList( $Blog->get_setting('posts_per_feed') );
3505@@ -29,7 +27,7 @@
3506 // What level of detail do we want?
3507 $feed_content = $Blog->get_setting('feed_content');
3508 if( $feed_content == 'none' )
3509-{ // We don't want to provide this feed!
3510+{ // We don't want to provide this feed!
3511 // This will normaly have been detected earlier but just for security:
3512 debug_die( 'Feeds are disabled.');
3513 }
3514@@ -49,9 +47,9 @@
3515 'title_before'=> ' - ',
3516 'title_after' => '',
3517 'title_none' => '',
3518- 'glue' => ' - ',
3519+ 'glue' => ' - ',
3520 'title_single_disp' => true,
3521- 'format' => 'xml',
3522+ 'format' => 'xml',
3523 ) );
3524 // ------------------------------ END OF REQUEST TITLE -----------------------------
3525 ?></title>
3526@@ -64,7 +62,7 @@
3527 <ttl>60</ttl>
3528 <?php
3529 while( $Item = & mainlist_get_item() )
3530- { // For each blog post, do everything below up to the closing curly brace "}"
3531+ { // For each blog post, do everything below up to the closing curly brace "}"
3532 ?>
3533 <item>
3534 <title><?php $Item->title( array(
3535@@ -74,76 +72,77 @@
3536 <link><?php $Item->permanent_url( 'single' ) ?></link>
3537 <?php
3538 $Item->issue_date( array(
3539- 'before' => '<pubDate>',
3540- 'after' => '</pubDate>',
3541+ 'before' => '<pubDate>',
3542+ 'after' => '</pubDate>',
3543 'date_format' => 'r',
3544- 'use_GMT' => true,
3545+ 'use_GMT' => true,
3546 ) );
3547 ?>
3548 <dc:creator><?php $Item->get_creator_User(); $Item->creator_User->preferred_name('xml') ?></dc:creator>
3549 <?php
3550 $Item->categories( array(
3551- 'before' => '',
3552- 'after' => '',
3553- 'include_main' => true,
3554- 'include_other' => true,
3555+ 'before' => '',
3556+ 'after' => '',
3557+ 'include_main' => true,
3558+ 'include_other' => true,
3559 'include_external'=> true,
3560- 'before_main' => '<category domain="main">',
3561- 'after_main' => '</category>',
3562- 'before_other' => '<category domain="alt">',
3563- 'after_other' => '</category>',
3564+ 'before_main' => '<category domain="main">',
3565+ 'after_main' => '</category>',
3566+ 'before_other' => '<category domain="alt">',
3567+ 'after_other' => '</category>',
3568 'before_external' => '<category domain="external">',
3569 'after_external' => '</category>',
3570 'link_categories' => false,
3571- 'separator' => "\n",
3572- 'format' => 'htmlbody', // TODO: "xml" eats away the tags!!
3573+ 'separator' => "\n",
3574+ 'format' => 'htmlbody',
3575+ /**
3576+ * @todo (legacy): "xml" eats away the tags!!
3577+ */
3578 ) );
3579 ?>
3580- <guid isPermaLink="false"><?php $Item->ID() ?>@<?php echo $baseurl ?></guid>
3581+ <guid isPermaLink="false"><?php $Item->ID(); ?>@<?php echo $baseurl ?></guid>
3582 <?php
3583 // PODCAST ------------------------------------------------------------------------
3584 if( $Item->ptyp_ID == 2000 )
3585- { // This is a podcast Item !
3586+ { // This is a podcast Item !
3587 echo '<enclosure url="'.$Item->url.'" />';
3588 // TODO: add length="12216320" type="audio/mpeg"
3589 }
3590
3591 if( $feed_content == 'excerpt' )
3592- { // EXCERPTS ---------------------------------------------------------------------
3593+ { // EXCERPTS ---------------------------------------------------------------------
3594
3595 ?>
3596 <description><?php
3597 $content = $Item->get_excerpt( 'entityencoded' );
3598
3599- // fp> this is another one of these "oooooh it's just a tiny little change"
3600- // and "we only need to make the links absolute in RSS"
3601- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3602- // TODO: clean solution : work in format_to_output!
3603+ /**
3604+ * @todo (legacy): clean solution : work in format_to_output!
3605+ */
3606 echo make_rel_links_abs( $content );
3607
3608 // Display Item footer text (text can be edited in Blog Settings):
3609 $Item->footer( array(
3610- 'mode' => 'xml',
3611+ 'mode' => 'xml',
3612 'block_start' => '<div class="item_footer">',
3613- 'block_end' => '</div>',
3614- 'format' => 'entityencoded',
3615+ 'block_end' => '</div>',
3616+ 'format' => 'entityencoded',
3617 ) );
3618 ?></description>
3619 <content:encoded><![CDATA[<?php
3620 $content = $Item->get_excerpt( 'htmlbody' );
3621
3622- // fp> this is another one of these "oooooh it's just a tiny little change"
3623- // and "we only need to make the links absolute in RSS"
3624- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3625- // TODO: clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
3626+ /**
3627+ * @todo (legacy): clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
3628+ */
3629 echo make_rel_links_abs( $content );
3630
3631 // Display Item footer text (text can be edited in Blog Settings):
3632 $Item->footer( array(
3633- 'mode' => 'xml',
3634+ 'mode' => 'xml',
3635 'block_start' => '<div class="item_footer">',
3636- 'block_end' => '</div>',
3637- 'format' => 'htmlbody',
3638+ 'block_end' => '</div>',
3639+ 'format' => 'htmlbody',
3640 ) );
3641 ?>]]></content:encoded>
3642 <?php
3643@@ -151,105 +150,106 @@
3644 }
3645 elseif( $feed_content == 'normal'
3646 || $feed_content == 'full' )
3647- { // POST CONTENTS -----------------------------------------------------------------
3648+ { // POST CONTENTS -----------------------------------------------------------------
3649
3650 ?>
3651 <description><?php
3652- // URL link, if the post has one: (TODO: move below the text, because in summaries or podcasts it blows to have this on top)
3653+ // URL link, if the post has one:
3654+ /**
3655+ * @todo (legacy): move below the text, because in summaries or podcasts it blows to have this on top
3656+ */
3657 $Item->url_link( array(
3658- 'before' => '<p>',
3659- 'after' => '</p>',
3660- 'format' => 'entityencoded',
3661- 'podcast' => false,
3662+ 'before' => '<p>',
3663+ 'after' => '</p>',
3664+ 'format' => 'entityencoded',
3665+ 'podcast' => false,
3666 ) );
3667
3668 // Display images that are linked to this post:
3669 $content = $Item->get_images( array(
3670- 'before' => '<div>',
3671- 'before_image' => '<div>',
3672+ 'before' => '<div>',
3673+ 'before_image' => '<div>',
3674 'before_image_legend' => '<div><i>',
3675 'after_image_legend' => '</i></div>',
3676- 'after_image' => '</div>',
3677- 'after' => '</div>',
3678- 'image_size' => 'fit-320x320'
3679+ 'after_image' => '</div>',
3680+ 'after' => '</div>',
3681+ 'image_size' => 'fit-320x320'
3682 ), 'entityencoded' );
3683
3684 $content .= $Item->get_content_teaser( 1, false, 'entityencoded' );
3685
3686 if( $feed_content == 'normal' )
3687- { // Teasers only
3688+ { // Teasers only
3689 $content .= $Item->get_more_link( array(
3690- 'before' => '',
3691- 'after' => '',
3692+ 'before' => '',
3693+ 'after' => '',
3694 'disppage' => 1,
3695- 'format' => 'entityencoded',
3696+ 'format' => 'entityencoded',
3697 ) );
3698 }
3699 else
3700- { // Full contents
3701+ { // Full contents
3702 $content .= $Item->get_content_extension( 1, true, 'entityencoded' );
3703 }
3704
3705- // fp> this is another one of these "oooooh it's just a tiny little change"
3706- // and "we only need to make the links absolute in RSS"
3707- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3708- // TODO: clean solution : work in format_to_output!
3709+ /**
3710+ * @todo (legacy): clean solution : work in format_to_output!
3711+ */
3712 echo make_rel_links_abs( $content );
3713
3714 // Display Item footer text (text can be edited in Blog Settings):
3715 $Item->footer( array(
3716- 'mode' => 'xml',
3717+ 'mode' => 'xml',
3718 'block_start' => '<div class="item_footer">',
3719- 'block_end' => '</div>',
3720- 'format' => 'entityencoded',
3721+ 'block_end' => '</div>',
3722+ 'format' => 'entityencoded',
3723 ) );
3724 ?></description>
3725 <content:encoded><![CDATA[<?php
3726 // URL link, if the post has one:
3727 $Item->url_link( array(
3728- 'before' => '<p>',
3729- 'after' => '</p>',
3730- 'podcast' => false,
3731+ 'before' => '<p>',
3732+ 'after' => '</p>',
3733+ 'podcast' => false,
3734 ) );
3735
3736 // Display images that are linked to this post:
3737 $content = $Item->get_images( array(
3738- 'before' => '<div>',
3739- 'before_image' => '<div>',
3740+ 'before' => '<div>',
3741+ 'before_image' => '<div>',
3742 'before_image_legend' => '<div><i>',
3743 'after_image_legend' => '</i></div>',
3744- 'after_image' => '</div>',
3745- 'after' => '</div>',
3746- 'image_size' => 'fit-320x320'
3747+ 'after_image' => '</div>',
3748+ 'after' => '</div>',
3749+ 'image_size' => 'fit-320x320'
3750 ), 'htmlbody' );
3751
3752 $content .= $Item->get_content_teaser( 1, false );
3753
3754 if( $feed_content == 'normal' )
3755- { // Teasers only
3756+ { // Teasers only
3757 $content .= $Item->get_more_link( array(
3758- 'before' => '',
3759- 'after' => '',
3760+ 'before' => '',
3761+ 'after' => '',
3762 'disppage' => 1,
3763 ) );
3764 }
3765 else
3766- { // Full contents
3767+ { // Full contents
3768 $content .= $Item->get_content_extension( 1, true );
3769 }
3770
3771- // fp> this is another one of these "oooooh it's just a tiny little change"
3772- // and "we only need to make the links absolute in RSS"
3773- // and then you get half baked code! The URL LINK stays RELATIVE!! :((
3774- // TODO: clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
3775+ /**
3776+ * @todo (legacy): clean solution : work in format_to_output! --- we probably need 'htmlfeed' as 'htmlbody+absolute'
3777+ */
3778 echo make_rel_links_abs( $content );
3779
3780 // Display Item footer text (text can be edited in Blog Settings):
3781 $Item->footer( array(
3782- 'mode' => 'xml',
3783+ 'mode' => 'xml',
3784 'block_start' => '<div class="item_footer">',
3785- 'block_end' => '</div>',
3786- 'format' => 'htmlbody',
3787+ 'block_end' => '</div>',
3788+ 'format' => 'htmlbody',
3789 ) );
3790 ?>]]></content:encoded>
3791 <?php
3792
3793=== modified file 'templates/_sitemap/index.main.php'
3794--- templates/_sitemap/index.main.php 2010-01-02 08:34:34 +0000
3795+++ templates/_sitemap/index.main.php 2010-01-09 20:22:21 +0000
3796@@ -51,7 +51,7 @@
3797 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
3798 <?php
3799 while( $Item = & mainlist_get_item() )
3800-{ // For each blog post, do everything below up to the closing curly brace "}"
3801+{ // For each blog post, do everything below up to the closing curly brace "}"
3802 // age in days of teh post
3803 $age = ($localtimenow - mysql2timestamp($Item->datemodified)) / 86400;
3804 // Prio: Recent posts will get higher priority compared to older posts, in case the SE doesn't want to index all posts!
3805@@ -95,4 +95,4 @@
3806 <?php
3807
3808 $Timer->stop( 'display list' );
3809-?>
3810\ No newline at end of file
3811+?>
3812
3813=== modified file 'templates/_subs.disp.php'
3814--- templates/_subs.disp.php 2009-12-21 17:27:20 +0000
3815+++ templates/_subs.disp.php 2010-01-09 20:22:21 +0000
3816@@ -16,7 +16,7 @@
3817 *
3818 * @license http://quamplures.net/license.html GNU General Public License (GPL)
3819 *
3820- * @todo dh> Allow limiting to current blog and list of "public" ones (e.g. with blog_disp_bloglist==1)
3821+ * @todo (legacy): dh> Allow limiting to current blog and list of "public" ones (e.g. with blog_disp_bloglist==1)
3822 *
3823 * {@internal Below is a list of authors who have contributed to design/coding of this file: }}
3824 * @author fplanque: Francois PLANQUE.
3825@@ -64,9 +64,9 @@
3826
3827 // Get those blogs for which we have already subscriptions (for this user)
3828 $sql = 'SELECT blog_ID, blog_shortname, sub_items, sub_comments
3829- FROM T_blogs INNER JOIN T_subscriptions ON ( blog_ID = sub_coll_ID AND sub_user_ID = '.$current_User->ID.' )
3830- INNER JOIN T_coll_settings ON ( blog_ID = cset_coll_ID AND cset_name = "allow_subscriptions" AND cset_value = "1" )
3831- WHERE blog_in_bloglist <> 0';
3832+ FROM T_blogs INNER JOIN T_subscriptions ON ( blog_ID = sub_coll_ID AND sub_user_ID = '.$current_User->ID.' )
3833+ INNER JOIN T_coll_settings ON ( blog_ID = cset_coll_ID AND cset_name = "allow_subscriptions" AND cset_value = "1" )
3834+ WHERE blog_in_bloglist <> 0';
3835 $blog_subs = $DB->get_results( $sql );
3836
3837 $encountered_current_blog = false;
3838@@ -80,7 +80,7 @@
3839
3840 $subs_blog_IDs[] = $blog_sub->blog_ID;
3841 $subscriptions = array(
3842- array( 'sub_items_'.$blog_sub->blog_ID, '1', T_('Posts'), $blog_sub->sub_items ),
3843+ array( 'sub_items_'.$blog_sub->blog_ID, '1', T_('Posts'), $blog_sub->sub_items ),
3844 array( 'sub_comments_'.$blog_sub->blog_ID, '1', T_('Comments'), $blog_sub->sub_comments )
3845 );
3846 $Form->checklist( $subscriptions, 'subscriptions', format_to_output( $blog_sub->blog_shortname, 'htmlbody' ) );
3847@@ -89,10 +89,10 @@
3848 if( $Blog->get_setting( 'allow_subscriptions' ) )
3849 {
3850 if( !$encountered_current_blog )
3851- { // Propose current blog too:
3852+ { // Propose current blog too:
3853 $subs_blog_IDs[] = $Blog->ID;
3854 $subscriptions = array(
3855- array( 'sub_items_'.$Blog->ID, '1', T_('Posts'), 0 ),
3856+ array( 'sub_items_'.$Blog->ID, '1', T_('Posts'), 0 ),
3857 array( 'sub_comments_'.$Blog->ID, '1', T_('Comments'), 0 )
3858 );
3859 $Form->checklist( $subscriptions, 'subscriptions', $Blog->dget('shortname') );
3860@@ -108,7 +108,7 @@
3861 $Form->end_fieldset();
3862
3863 $Form->end_form( array( array( '', '', T_('Update'), 'SaveButton' ),
3864- array( 'reset', '', T_('Reset'), 'ResetButton' ) ) );
3865-
3866-
3867-?>
3868\ No newline at end of file
3869+ array( 'reset', '', T_('Reset'), 'ResetButton' ) ) );
3870+
3871+
3872+?>
3873
3874=== modified file 'templates/_toolbar.inc.php'
3875--- templates/_toolbar.inc.php 2009-12-12 16:12:01 +0000
3876+++ templates/_toolbar.inc.php 2010-01-09 20:22:21 +0000
3877@@ -4,13 +4,11 @@
3878 *
3879 * This is meant to be included in a page template.
3880 *
3881- * @todo dh> with disabled JavaScript the expanded submenu boxes
3882- * for "Customize" do not get moved to the correct
3883- * place/screen offset.
3884- * I think the display of the submenus should get done
3885- * only with JS in this case (and not with hover).
3886- *
3887- * -at- tutorial page placeholder _toolbar.inc.php
3888+ * @todo (legacy): dh> with disabled JavaScript the expanded submenu boxes
3889+ * for "Customize" do not get moved to the correct
3890+ * place/screen offset.
3891+ * I think the display of the submenus should get done
3892+ * only with JS in this case (and not with hover).
3893 *
3894 * @package templates
3895 */
3896
3897=== modified file 'templates/_user.disp.php'
3898--- templates/_user.disp.php 2009-12-21 17:27:20 +0000
3899+++ templates/_user.disp.php 2010-01-09 20:22:21 +0000
3900@@ -71,7 +71,9 @@
3901 // Load the user fields:
3902 $User->userfields_load();
3903
3904- // fp> TODO: have some clean iteration support
3905+ /**
3906+ * @todo (legacy): fp> have some clean iteration support
3907+ */
3908 foreach( $User->userfields as $uf_ID=>$uf_array )
3909 {
3910 $ProfileForm->info( $User->userfield_defs[$uf_array[0]][1], $uf_array[1] );
3911@@ -91,4 +93,4 @@
3912 $ProfileForm->end_form();
3913
3914
3915-?>
3916\ No newline at end of file
3917+?>
3918
3919=== modified file 'templates/_wp_compatibility.inc.php'
3920--- templates/_wp_compatibility.inc.php 2010-01-02 15:13:47 +0000
3921+++ templates/_wp_compatibility.inc.php 2010-01-09 20:22:21 +0000
3922@@ -7,76 +7,74 @@
3923 * This should not be used in redistributed templates as this
3924 * will NOT provide FULL QP functionality.
3925 *
3926+ * @todo EdB: are we going to keep this wp-compatibility thing, and if so are
3927+ * we going to get rid of the stupid "UNSUPPORTED" attitude problem? I mean
3928+ * if we write it don't we 'support' it as much as the rest of our code?
3929+ *
3930+ * @todo EdB: tutorial sample for template_widget()is probably not complete
3931+ *
3932 * @package templates
3933 */
3934 if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
3935
3936-
3937 /**
3938 * WP compatibility variable - UNSUPPORTED.
3939 */
3940 global $siteurl;
3941 $siteurl = $Blog->get('url');
3942
3943-
3944-
3945 /**
3946 * WP compatibility template tag - UNSUPPORTED.
3947 */
3948 function get_calendar()
3949 {
3950 global $Plugins;
3951- // ------------------------------- START OF CALENDAR ---------------------------------
3952- // Call the Calendar plugin (if installed):
3953- $Plugins->call_by_code( 'evo_Calr', array( // Params follow:
3954- 'block_start' => '',
3955- 'block_end' => '',
3956- 'displaycaption' => true,
3957- 'linktomontharchive' => false,
3958- 'headerdisplay' => 'e',
3959- 'tablestart' => '<table id="wp-calendar" class="bCalendarTable" cellspacing="0" summary="Monthly calendar with links to each day\'s posts">'."\n",
3960- ) );
3961- // -------------------------------- END OF CALENDAR ----------------------------------
3962+ // display the Calendar plugin (if installed)
3963+ $Plugins->call_by_code( 'evo_Calr', array(
3964+ 'block_start' => '',
3965+ 'block_end' => '',
3966+ 'displaycaption' => true,
3967+ 'linktomontharchive' => false,
3968+ 'headerdisplay' => 'e',
3969+ 'tablestart' => '<table id="wp-calendar" class="bCalendarTable" cellspacing="0" summary="Monthly calendar with links to each day\'s posts">'."\n",
3970+ ) );
3971 }
3972
3973-
3974 /**
3975 * WP compatibility template tag - UNSUPPORTED.
3976 */
3977 function wp_list_cats()
3978 {
3979- // --------------------------------- START OF CATEGORY LIST --------------------------------
3980+ // display the Category List widget
3981 template_widget( array(
3982- // CODE for the widget:
3983- 'widget' => 'coll_category_list',
3984- // Optional display params
3985- 'block_start' => '<div class="bSideItem">',
3986- 'block_end' => '</div>',
3987- 'block_title_start' => '<h3 class="sideItemTitle">',
3988- 'block_title_end' => '</h3>',
3989- ) );
3990- // ---------------------------------- END OF CATEGORY LIST ---------------------------------
3991+ 'widget' => 'coll_category_list',
3992+ // block-level params...
3993+ 'block_start' => '<div class="bSideItem">',
3994+ 'block_end' => '</div>',
3995+ 'block_title_start' => '<h3 class="sideItemTitle">',
3996+ 'block_title_end' => '</h3>',
3997+ ) );
3998 }
3999
4000-
4001 /**
4002 * WP compatibility template tag - UNSUPPORTED.
4003 */
4004 function wp_tag_cloud()
4005 {
4006+ // display the Tag Cloud widget
4007 template_widget( array(
4008- // CODE for the widget:
4009- 'widget' => 'coll_tag_cloud',
4010- // Optional display params
4011- 'block_start' => '<div class="tag_cloud">',
4012- 'block_end' => '</div>',
4013- 'block_title_start' => '<h3 class="sideItemTitle">',
4014- 'title' => 'Tag Cloud:',
4015- 'block_title_end' => '</h3>',
4016- 'max_tags' => 100,
4017- 'min_size' => 8,
4018- 'max_size' => 22,
4019- ) );
4020+ 'widget' => 'coll_tag_cloud',
4021+ 'title' => T_( 'Tag Cloud' ).':',
4022+ // block-level params...
4023+ 'block_start' => '<div class="tag_cloud">',
4024+ 'block_end' => '</div>',
4025+ 'block_title_start' => '<h3 class="sideItemTitle">',
4026+ 'block_title_end' => '</h3>',
4027+ // widget-specific params...
4028+ 'max_tags' => 100,
4029+ 'min_size' => 8,
4030+ 'max_size' => 22,
4031+ ) );
4032 }
4033
4034
4035@@ -97,7 +95,7 @@
4036 {
4037 global $Item;
4038 $Item->title( array(
4039- 'link_type' => 'none',
4040+ 'link_type' => 'none',
4041 ) );
4042 }
4043
4044@@ -153,7 +151,7 @@
4045 {
4046 global $Item;
4047 $Item->issue_time( array(
4048- 'time_format' => $format,
4049+ 'time_format' => $format,
4050 ) );
4051 }
4052
4053@@ -175,17 +173,17 @@
4054 {
4055 global $Item;
4056 $Item->feedback_link( array(
4057- 'type' => 'feedbacks',
4058- 'status' => 'published',
4059- 'link_before' => '',
4060- 'link_after' => '',
4061- 'link_text_zero' => $zero,
4062- 'link_text_one' => $one,
4063- 'link_text_more' => str_replace( '%', '%d', $more ),
4064- 'link_title' => '#',
4065- 'use_popup' => false,
4066- 'url' => '#',
4067- ) );
4068+ 'type' => 'feedbacks',
4069+ 'status' => 'published',
4070+ 'link_before' => '',
4071+ 'link_after' => '',
4072+ 'link_text_zero' => $zero,
4073+ 'link_text_one' => $one,
4074+ 'link_text_more' => str_replace( '%', '%d', $more ),
4075+ 'link_title' => '#',
4076+ 'use_popup' => false,
4077+ 'url' => '#',
4078+ ) );
4079 }
4080
4081
4082@@ -206,22 +204,22 @@
4083 {
4084 global $Item;
4085 $Item->categories( array(
4086- 'before' => ' ',
4087- 'after' => ' ',
4088- 'include_main' => true,
4089- 'include_other' => true,
4090- 'include_external'=> true,
4091- 'before_main' => '', // string fo display before the MAIN category,
4092- 'after_main' => '', // string fo display after the MAIN category
4093- 'before_other' => '', // string fo display before OTHER categories
4094- 'after_other' => '', // string fo display after OTHER categories
4095- 'before_external' => '<em>', // string fo display before EXTERNAL categories
4096- 'after_external' => '</em>', // string fo display after EXTERNAL categories,
4097- 'separator' => $separator,
4098- 'link_categories' => true,
4099- 'link_title' => '#',
4100- 'format' => 'htmlbody',
4101- ) );
4102+ 'before' => ' ',
4103+ 'after' => ' ',
4104+ 'include_main' => true,
4105+ 'include_other' => true,
4106+ 'include_external'=> true,
4107+ 'before_main' => '', // string fo display before the MAIN category,
4108+ 'after_main' => '', // string fo display after the MAIN category
4109+ 'before_other' => '', // string fo display before OTHER categories
4110+ 'after_other' => '', // string fo display after OTHER categories
4111+ 'before_external' => '<em>', // string fo display before EXTERNAL categories
4112+ 'after_external' => '</em>', // string fo display after EXTERNAL categories,
4113+ 'separator' => $separator,
4114+ 'link_categories' => true,
4115+ 'link_title' => '#',
4116+ 'format' => 'htmlbody',
4117+ ) );
4118 }
4119
4120
4121@@ -232,11 +230,11 @@
4122 {
4123 global $Item;
4124 $Item->tags( array(
4125- 'before' => $before,
4126- 'after' => $after,
4127- 'separator' => $sep,
4128- 'links' => true,
4129- ) );
4130+ 'before' => $before,
4131+ 'after' => $after,
4132+ 'separator' => $sep,
4133+ 'links' => true,
4134+ ) );
4135 }
4136
4137
4138@@ -282,12 +280,12 @@
4139 return;
4140 }
4141 $MainList->page_links( array(
4142- 'block_start' => ' ',
4143- 'block_end' => ' ',
4144- 'block_single' => '',
4145- 'links_format' => '$prev$',
4146- 'prev_text' => $link_text,
4147- ) );
4148+ 'block_start' => ' ',
4149+ 'block_end' => ' ',
4150+ 'block_single' => '',
4151+ 'links_format' => '$prev$',
4152+ 'prev_text' => $link_text,
4153+ ) );
4154 }
4155
4156
4157@@ -302,10 +300,11 @@
4158 return;
4159 }
4160 $MainList->page_links( array(
4161- 'block_start' => ' ',
4162- 'block_end' => ' ',
4163- 'block_single' => '',
4164- 'links_format' => '$next$',
4165- 'next_text' => $link_text,
4166- ) );
4167+ 'block_start' => ' ',
4168+ 'block_end' => ' ',
4169+ 'block_single' => '',
4170+ 'links_format' => '$next$',
4171+ 'next_text' => $link_text,
4172+ ) );
4173 }
4174+?>
4175
4176=== modified file 'templates/asevo/_body_footer.inc.php'
4177--- templates/asevo/_body_footer.inc.php 2010-01-02 08:34:34 +0000
4178+++ templates/asevo/_body_footer.inc.php 2010-01-09 20:22:21 +0000
4179@@ -16,8 +16,8 @@
4180 <?php
4181 // Display footer text (text can be edited in Blog Settings):
4182 $Blog->footer_text( array(
4183- 'before' => '<p class="baseline">',
4184- 'after' => '</p>',
4185+ 'before' => '<p class="baseline">',
4186+ 'after' => '</p>',
4187 ) );
4188 ?>
4189
4190@@ -25,9 +25,9 @@
4191 <?php
4192 // Display a link to contact the owner of this blog (if owner accepts messages):
4193 $Blog->contact_link( array(
4194- 'before' => '',
4195- 'after' => ' | ',
4196- 'text' => T_('Contact'),
4197+ 'before' => '',
4198+ 'after' => ' | ',
4199+ 'text' => T_('Contact'),
4200 'title' => T_('Send a message to the owner of this blog...'),
4201 ) );
4202 ?>
4203
4204=== modified file 'templates/asevo/_item_block.inc.php'
4205--- templates/asevo/_item_block.inc.php 2010-01-02 15:13:47 +0000
4206+++ templates/asevo/_item_block.inc.php 2010-01-09 20:22:21 +0000
4207@@ -19,24 +19,23 @@
4208
4209 // Default params:
4210 $params = array_merge( array(
4211- 'feature_block' => false,
4212- 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail
4213- 'item_class' => 'evo_post',
4214- 'image_size' => 'fit-400x320',
4215+ 'feature_block' => false,
4216+ 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail
4217+ 'item_class' => 'evo_post',
4218+ 'image_size' => 'fit-400x320',
4219 ), $params );
4220-
4221 ?>
4222-<div id="<?php $Item->anchor_id() ?>" class="<?php $Item->div_classes( $params ) ?>" lang="<?php $Item->lang() ?>">
4223
4224- <?php
4225+<div id="<?php $Item->anchor_id(); ?>" class="<?php $Item->div_classes( $params ) ?>" lang="<?php $Item->lang(); ?>">
4226+<?php
4227 $Item->locale_temp_switch(); // Temporarily switch to post locale (useful for multilingual blogs)
4228 ?>
4229
4230 <?php
4231 $Item->edit_link( array( // Link to backoffice for editing
4232- 'before' => ' ',
4233- 'after' => ' ',
4234- 'class' => 'floatright small'
4235+ 'before' => ' ',
4236+ 'after' => ' ',
4237+ 'class' => 'floatright small'
4238 ) );
4239 ?>
4240
4241@@ -49,35 +48,35 @@
4242 ) );
4243
4244 $Item->issue_date( array(
4245- 'before' => ' ',
4246- 'after' => ' ',
4247+ 'before' => ' ',
4248+ 'after' => ' ',
4249 'date_format' => '#',
4250 ) );
4251
4252 $Item->issue_time( array(
4253- 'after' => '',
4254+ 'after' => '',
4255 'time_format' => 'H:i',
4256 ) );
4257
4258 $Item->author( array(
4259- 'before' => ', '.T_('by').' ',
4260- 'after' => '',
4261+ 'before' => ', '.T_('by').' ',
4262+ 'after' => '',
4263 ) );
4264
4265 $Item->categories( array(
4266- 'before' => ', '.T_('Categories').': ',
4267- 'after' => ' ',
4268- 'include_main' => true,
4269- 'include_other' => true,
4270+ 'before' => ', '.T_('Categories').': ',
4271+ 'after' => ' ',
4272+ 'include_main' => true,
4273+ 'include_other' => true,
4274 'include_external'=> true,
4275 'link_categories' => true,
4276 ) );
4277
4278 // List all tags attached to this post:
4279 $Item->tags( array(
4280- 'before' => ', '.T_('Tags').': ',
4281- 'after' => ' ',
4282- 'separator' => ', ',
4283+ 'before' => ', '.T_('Tags').': ',
4284+ 'after' => ' ',
4285+ 'separator' => ', ',
4286 ) );
4287 ?>
4288 </div>
4289
4290=== modified file 'templates/asevo/index.main.php'
4291--- templates/asevo/index.main.php 2010-01-03 15:47:32 +0000
4292+++ templates/asevo/index.main.php 2010-01-09 20:22:21 +0000
4293@@ -89,7 +89,7 @@
4294 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
4295 messages( array(
4296 'block_start' => '<div class="action_messages">',
4297- 'block_end' => '</div>',
4298+ 'block_end' => '</div>',
4299 ) );
4300 // --------------------------------- END OF MESSAGES ---------------------------------
4301 ?>
4302@@ -99,10 +99,10 @@
4303 item_prevnext_links( array(
4304 'block_start' => '<table class="prevnext_post"><tr>',
4305 'prev_start' => '<td>',
4306- 'prev_end' => '</td>',
4307+ 'prev_end' => '</td>',
4308 'next_start' => '<td class="right">',
4309- 'next_end' => '</td>',
4310- 'block_end' => '</tr></table>',
4311+ 'next_end' => '</td>',
4312+ 'block_end' => '</tr></table>',
4313 ) );
4314 // ------------------------- END OF PREV/NEXT POST LINKS -------------------------
4315 ?>
4316@@ -113,9 +113,9 @@
4317 'title_before'=> '<h2 class="evo_req_title">',
4318 'title_after' => '</h2>',
4319 'title_none' => '',
4320- 'glue' => ' - ',
4321+ 'glue' => ' - ',
4322 'title_single_disp' => false,
4323- 'format' => 'htmlbody',
4324+ 'format' => 'htmlbody',
4325 ) );
4326 // ------------------------------ END OF REQUEST TITLE -----------------------------
4327
4328@@ -152,8 +152,8 @@
4329 'block_start' => '<p class="center"><strong>',
4330 'block_end' => '</strong></p>',
4331 'links_format' => '$prev$ :: $next$',
4332- 'prev_text' => '&lt;&lt; '.T_('Previous'),
4333- 'next_text' => T_('Next').' &gt;&gt;',
4334+ 'prev_text' => '&lt;&lt; '.T_('Previous'),
4335+ 'next_text' => T_('Next').' &gt;&gt;',
4336 ) );
4337 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
4338
4339
4340=== modified file 'templates/basic/_item_content.inc.php'
4341--- templates/basic/_item_content.inc.php 2009-12-12 16:12:01 +0000
4342+++ templates/basic/_item_content.inc.php 2010-01-09 20:22:21 +0000
4343@@ -16,13 +16,13 @@
4344
4345 // Display images that are linked to this post:
4346 $Item->images( array(
4347- 'before' => '<table cellspacing="5">',
4348- 'before_image' => '<tr><td align="center">',
4349+ 'before' => '<table cellspacing="5">',
4350+ 'before_image' => '<tr><td align="center">',
4351 'before_image_legend' => '<br><small>',
4352 'after_image_legend' => '</small>',
4353- 'after_image' => '</td></tr>',
4354- 'after' => '</table>',
4355- 'image_size' => 'fit-400x320'
4356+ 'after_image' => '</td></tr>',
4357+ 'after' => '</table>',
4358+ 'image_size' => 'fit-400x320'
4359 ) );
4360 ?>
4361
4362@@ -35,13 +35,13 @@
4363
4364 // Display CONTENT:
4365 $Item->content_teaser( array(
4366- 'before' => '',
4367- 'after' => '',
4368+ 'before' => '',
4369+ 'after' => '',
4370 ) );
4371 $Item->more_link();
4372 $Item->content_extension( array(
4373- 'before' => '',
4374- 'after' => '',
4375+ 'before' => '',
4376+ 'after' => '',
4377 ) );
4378
4379 // Links to post pages (for multipage posts):
4380@@ -49,9 +49,9 @@
4381
4382 // Display Item footer text (text can be edited in Blog Settings):
4383 $Item->footer( array(
4384- 'mode' => '#', // Will detect 'single' from $disp automatically
4385+ 'mode' => '#', // Will detect 'single' from $disp automatically
4386 'block_start' => '<div class="item_footer">',
4387- 'block_end' => '</div>',
4388+ 'block_end' => '</div>',
4389 ) );
4390 ?>
4391 </div>
4392
4393=== modified file 'templates/basic/_item_feedback.inc.php'
4394--- templates/basic/_item_feedback.inc.php 2009-12-12 16:12:01 +0000
4395+++ templates/basic/_item_feedback.inc.php 2010-01-09 20:22:21 +0000
4396@@ -28,24 +28,24 @@
4397 $disp_comment_form = 1; // Display the comments form if comments requested
4398 $disp_trackbacks = 1; // Display the trackbacks if requested
4399 $disp_trackback_url = 1; // Display the trackbal URL if trackbacks requested
4400-$disp_pingbacks = 1; // pingbacks (deprecated)
4401+$disp_pingbacks = 1; // pingbacks (deprecated)
4402
4403
4404
4405 if( empty($c) )
4406-{ // Comments not requested
4407+{ // Comments not requested
4408 $disp_comments = 0; // DO NOT Display the comments if not requested
4409 $disp_comment_form = 0; // DO NOT Display the comments form if not requested
4410 }
4411
4412 if( empty($tb) || (!$Blog->get( 'allowtrackbacks' )) )
4413-{ // Trackback not requested or not allowed
4414+{ // Trackback not requested or not allowed
4415 $disp_trackbacks = 0; // DO NOT Display the trackbacks if not requested
4416 $disp_trackback_url = 0; // DO NOT Display the trackback URL if not requested
4417 }
4418
4419 if( empty($pb) )
4420-{ // Pingback not requested
4421+{ // Pingback not requested
4422 $disp_pingbacks = 0; // DO NOT Display the pingbacks if not requested
4423 }
4424
4425@@ -54,14 +54,14 @@
4426 <?php
4427
4428 if( ! ($disp_comments || $disp_comment_form || $disp_trackbacks || $disp_trackback_url || $disp_pingbacks ) )
4429-{ // Nothing more to do....
4430+{ // Nothing more to do....
4431 return false;
4432 }
4433
4434 $type_list = array();
4435 $disp_title = array();
4436 if( $disp_comments )
4437-{ // We requested to display comments
4438+{ // We requested to display comments
4439 if( $Item->can_see_comments() )
4440 { // User can see a comments
4441 $type_list[] = "'comment'";
4442@@ -87,7 +87,7 @@
4443
4444 <?php
4445 if( $disp_trackback_url )
4446-{ // We want to display the trackback URL:
4447+{ // We want to display the trackback URL:
4448 ?>
4449 <h4><?php echo T_('Trackback address for this post:') ?></h4>
4450 <?php
4451@@ -98,7 +98,7 @@
4452 if( ! $Plugins->trigger_event_first_true( 'DisplayTrackbackAddr', array('Item' => & $Item, 'template' => '<code>%url%</code>') ) )
4453 { // No plugin displayed a payload, so we just display the default:
4454 ?>
4455- <code><?php $Item->trackback_url() ?></code>
4456+ <code><?php $Item->trackback_url(); ?></code>
4457 <?php
4458 }
4459 }
4460@@ -122,17 +122,17 @@
4461 ) );
4462
4463 while( $Comment = & $CommentList->get_next() )
4464-{ // Loop through comments:
4465+{ // Loop through comments:
4466 ?>
4467 <!-- ========== START of a COMMENT/TB/PB ========== -->
4468- <?php $Comment->anchor() ?>
4469+ <?php $Comment->anchor(); ?>
4470 <h5>
4471 <?php
4472 switch( $Comment->get( 'type' ) )
4473 {
4474 case 'comment': // Display a comment:
4475 echo T_('Comment from:') ?>
4476- <?php $Comment->author() ?>
4477+ <?php $Comment->author(); ?>
4478 <?php $Comment->author_url( '', ' &middot; ', '' ) ?>
4479 <?php break;
4480
4481@@ -151,15 +151,14 @@
4482 ?>
4483 </h5>
4484 <blockquote>
4485- <small><?php $Comment->date() ?> @ <?php $Comment->time( 'H:i' ) ?></small>
4486- <div><?php $Comment->content() ?></div>
4487+ <small><?php $Comment->date(); ?> @ <?php $Comment->time( 'H:i' ) ?></small>
4488+ <div><?php $Comment->content(); ?></div>
4489 </blockquote>
4490- <!-- ========== END of a COMMENT/TB/PB ========== -->
4491 <?php
4492 }
4493
4494 if( $disp_comment_form )
4495-{ // We want to display the comments form:
4496+{ // We want to display the comments form:
4497 if( $Item->can_comment() )
4498 { // User can leave a comment
4499 ?>
4500@@ -171,10 +170,9 @@
4501 $comment_author_url = isset($_COOKIE[$cookie_url]) ? trim($_COOKIE[$cookie_url]) : '';
4502 ?>
4503
4504- <!-- form to add a comment -->
4505 <form action="<?php echo $htsrv_url ?>comment_post.php" method="post">
4506
4507- <input type="hidden" name="comment_post_ID" value="<?php echo $Item->ID() ?>" />
4508+ <input type="hidden" name="comment_post_ID" value="<?php echo $Item->ID(); ?>" />
4509 <input type="hidden" name="redirect_to" value="<?php echo htmlspecialchars(url_rel_to_same_host(regenerate_url('','','','&'), $htsrv_url)) ?>" />
4510
4511 <table>
4512
4513=== modified file 'templates/basic/index.main.php'
4514--- templates/basic/index.main.php 2010-01-03 15:47:32 +0000
4515+++ templates/basic/index.main.php 2010-01-09 20:22:21 +0000
4516@@ -23,13 +23,12 @@
4517 <title><?php
4518 // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
4519 request_title( array(
4520- 'auto_pilot' => 'seo_title',
4521+ 'auto_pilot' => 'seo_title',
4522 ) );
4523- // ------------------------------ END OF REQUEST TITLE -----------------------------
4524 ?></title>
4525 <?php template_base_tag(); /* Base URL for this template. You need this to fix relative links! */ ?>
4526 <?php meta_generator_tag(); /* Please leave this for stats */ ?>
4527- <?php include_headlines() ?>
4528+ <?php include_headlines(); ?>
4529 </head>
4530
4531 <body>
4532@@ -53,18 +52,18 @@
4533 <hr />
4534
4535 <div align="center">
4536-<h1><?php $Blog->name() ?></h1>
4537+<h1><?php $Blog->name(); ?></h1>
4538 <?php
4539 $Blog->tagline( array(
4540- 'before' => '<p>',
4541- 'after' => '</p>',
4542+ 'before' => '<p>',
4543+ 'after' => '</p>',
4544 ) );
4545 ?>
4546 </div>
4547 <?php
4548 $Blog->longdesc( array(
4549- 'before' => '<hr><small>',
4550- 'after' => '</small>',
4551+ 'before' => '<hr><small>',
4552+ 'after' => '</small>',
4553 ) );
4554 ?>
4555
4556@@ -74,7 +73,7 @@
4557 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
4558 messages( array(
4559 'block_start' => '<div class="action_messages">',
4560- 'block_end' => '</div>',
4561+ 'block_end' => '</div>',
4562 ) );
4563 // --------------------------------- END OF MESSAGES ---------------------------------
4564 ?>
4565@@ -84,10 +83,10 @@
4566 item_prevnext_links( array(
4567 'block_start' => '',
4568 'prev_start' => '',
4569- 'prev_end' => ' :',
4570+ 'prev_end' => ' :',
4571 'next_start' => ': ',
4572- 'next_end' => '',
4573- 'block_end' => '',
4574+ 'next_end' => '',
4575+ 'block_end' => '',
4576 ) );
4577 // ------------------------- END OF PREV/NEXT POST LINKS -------------------------
4578 ?>
4579@@ -98,11 +97,10 @@
4580 'title_before'=> '<h2>',
4581 'title_after' => '</h2>',
4582 'title_none' => '',
4583- 'glue' => ' - ',
4584+ 'glue' => ' - ',
4585 'title_single_disp' => true,
4586- 'format' => 'htmlbody',
4587+ 'format' => 'htmlbody',
4588 ) );
4589- // ------------------------------ END OF REQUEST TITLE -----------------------------
4590 ?>
4591
4592 <?php // ---------------------------------- START OF POSTS --------------------------------------
4593@@ -110,19 +108,19 @@
4594 display_if_empty();
4595
4596 while( $Item = & mainlist_get_item() )
4597- { // For each blog post, do everything below up to the closing curly brace "}"
4598+ { // For each blog post, do everything below up to the closing curly brace "}"
4599 ?>
4600
4601 <?php
4602 // ------------------------------ DATE SEPARATOR ------------------------------
4603 $MainList->date_if_changed( array(
4604- 'before' => '<h2>',
4605- 'after' => '</h2>',
4606+ 'before' => '<h2>',
4607+ 'after' => '</h2>',
4608 'date_format' => '#',
4609 ) );
4610 ?>
4611
4612- <div id="<?php $Item->anchor_id() ?>" lang="<?php $Item->lang() ?>">
4613+ <div id="<?php $Item->anchor_id(); ?>" lang="<?php $Item->lang(); ?>">
4614
4615 <?php
4616 $Item->locale_temp_switch(); // Temporarily switch to post locale (useful for multilingual blogs)
4617@@ -130,7 +128,7 @@
4618
4619 <h3>
4620 <?php $Item->issue_time(); ?>
4621- <a href="<?php $Item->permanent_url() ?>" title="<?php echo T_('Permanent link to full entry') ?>"><img src="img/icon_minipost.gif" alt="Permalink" width="12" height="9" border="0" align="absmiddle" /></a>
4622+ <a href="<?php $Item->permanent_url(); ?>" title="<?php echo T_('Permanent link to full entry') ?>"><img src="img/icon_minipost.gif" alt="Permalink" width="12" height="9" border="0" align="absmiddle" /></a>
4623 <?php $Item->title(); ?>
4624 </h3>
4625
4626@@ -138,10 +136,10 @@
4627
4628 <?php
4629 $Item->categories( array(
4630- 'before' => '<small>'.T_('Categories').': ',
4631- 'after' => '</small>',
4632- 'include_main' => true,
4633- 'include_other' => true,
4634+ 'before' => '<small>'.T_('Categories').': ',
4635+ 'after' => '</small>',
4636+ 'include_main' => true,
4637+ 'include_other' => true,
4638 'include_external'=> true,
4639 'link_categories' => true,
4640 ) );
4641@@ -169,8 +167,8 @@
4642
4643 <?php
4644 $Item->edit_link( array( // Link to backoffice for editing
4645- 'before' => '',
4646- 'after' => ' &bull; ',
4647+ 'before' => '',
4648+ 'after' => ' &bull; ',
4649 ) );
4650 ?>
4651
4652@@ -214,8 +212,8 @@
4653 'block_start' => '<p class="center"><strong>',
4654 'block_end' => '</strong></p>',
4655 'links_format' => '$prev$ :: $next$',
4656- 'prev_text' => '&lt;&lt; '.T_('Previous'),
4657- 'next_text' => T_('Next').' &gt;&gt;',
4658+ 'prev_text' => '&lt;&lt; '.T_('Previous'),
4659+ 'next_text' => T_('Next').' &gt;&gt;',
4660 ) );
4661 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
4662 ?>
4663@@ -228,9 +226,9 @@
4664 <?php
4665 // Display a link to contact the owner of this blog (if owner accepts messages):
4666 $Blog->contact_link( array(
4667- 'before' => ' [',
4668- 'after' => '] ',
4669- 'text' => T_('Contact'),
4670+ 'before' => ' [',
4671+ 'after' => '] ',
4672+ 'text' => T_('Contact'),
4673 'title' => T_('Send a message to the owner of this blog...'),
4674 ) );
4675 ?>
4676
4677=== modified file 'templates/custom/_item_block.inc.php'
4678--- templates/custom/_item_block.inc.php 2010-01-02 15:13:47 +0000
4679+++ templates/custom/_item_block.inc.php 2010-01-09 20:22:21 +0000
4680@@ -19,17 +19,15 @@
4681
4682 // Default params:
4683 $params = array_merge( array(
4684- 'feature_block' => false,
4685- 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail
4686- 'item_class' => 'bPost',
4687- 'image_size' => 'fit-400x320',
4688+ 'feature_block' => false,
4689+ 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail
4690+ 'item_class' => 'bPost',
4691+ 'image_size' => 'fit-400x320',
4692 ), $params );
4693-
4694 ?>
4695
4696-<div id="<?php $Item->anchor_id() ?>" class="<?php $Item->div_classes( $params ) ?>" lang="<?php $Item->lang() ?>">
4697-
4698- <?php
4699+<div id="<?php $Item->anchor_id(); ?>" class="<?php $Item->div_classes( $params ) ?>" lang="<?php $Item->lang(); ?>">
4700+<?php
4701 $Item->locale_temp_switch(); // Temporarily switch to post locale (useful for multilingual blogs)
4702 ?>
4703
4704@@ -41,13 +39,13 @@
4705 ) );
4706
4707 $Item->issue_time( array(
4708- 'before' => ' ',
4709- 'after' => '',
4710+ 'before' => ' ',
4711+ 'after' => '',
4712 ));
4713
4714 $Item->author( array(
4715- 'before' => ', '.T_('by').' ',
4716- 'after' => '',
4717+ 'before' => ', '.T_('by').' ',
4718+ 'after' => '',
4719 ) );
4720
4721 $Item->msgform_link();
4722@@ -59,8 +57,8 @@
4723 // $Item->views();
4724
4725 $Item->locale_flag( array(
4726- 'before' => ' &nbsp; ',
4727- 'after' => '',
4728+ 'before' => ' &nbsp; ',
4729+ 'after' => '',
4730 ) );
4731 ?>
4732
4733@@ -68,10 +66,10 @@
4734
4735 <?php
4736 $Item->categories( array(
4737- 'before' => T_('Categories').': ',
4738- 'after' => ' ',
4739- 'include_main' => true,
4740- 'include_other' => true,
4741+ 'before' => T_('Categories').': ',
4742+ 'after' => ' ',
4743+ 'include_main' => true,
4744+ 'include_other' => true,
4745 'include_external'=> true,
4746 'link_categories' => true,
4747 ) );
4748@@ -86,9 +84,9 @@
4749
4750 // List all tags attached to this post:
4751 $Item->tags( array(
4752- 'before' => '<div class="bSmallPrint">'.T_('Tags').': ',
4753- 'after' => '</div>',
4754- 'separator' => ', ',
4755+ 'before' => '<div class="bSmallPrint">'.T_('Tags').': ',
4756+ 'after' => '</div>',
4757+ 'separator' => ', ',
4758 ) );
4759 ?>
4760
4761@@ -124,8 +122,8 @@
4762 ) );
4763
4764 $Item->edit_link( array( // Link to backoffice for editing
4765- 'before' => ' &bull; ',
4766- 'after' => '',
4767+ 'before' => ' &bull; ',
4768+ 'after' => '',
4769 ) );
4770 ?>
4771 </div>
4772
4773=== modified file 'templates/custom/_template.class.php'
4774--- templates/custom/_template.class.php 2010-01-02 08:34:34 +0000
4775+++ templates/custom/_template.class.php 2010-01-09 20:22:21 +0000
4776@@ -40,8 +40,8 @@
4777
4778
4779 /**
4780- * Get definitions for editable params
4781- *
4782+ * Get definitions for editable params
4783+ *
4784 * @see Plugin::GetDefaultSettings()
4785 * @param local params like 'for_editing' => true
4786 */
4787@@ -82,12 +82,12 @@
4788 $custom_css = '';
4789
4790 if( $bg_color = $this->get_setting( 'head_bg_color') )
4791- { // Custom Header background color:
4792+ { // Custom Header background color:
4793 $custom_css .= ' div.pageHeader { background-color: '.$bg_color." }\n";
4794 }
4795
4796 if( $bg_color = $this->get_setting( 'menu_bg_color') )
4797- { // Custom Meu background color:
4798+ { // Custom Meu background color:
4799 $custom_css .= ' div.top_menu ul { background-color: '.$bg_color." }\n";
4800 }
4801
4802
4803=== modified file 'templates/custom/index.main.php'
4804--- templates/custom/index.main.php 2010-01-03 15:47:32 +0000
4805+++ templates/custom/index.main.php 2010-01-09 20:22:21 +0000
4806@@ -104,9 +104,9 @@
4807 'title_before'=> '<h2>',
4808 'title_after' => '</h2>',
4809 'title_none' => '',
4810- 'glue' => ' - ',
4811+ 'glue' => ' - ',
4812 'title_single_disp' => true,
4813- 'format' => 'htmlbody',
4814+ 'format' => 'htmlbody',
4815 ) );
4816
4817 // do we have a featured/intro item to display?
4818@@ -136,12 +136,12 @@
4819 display_if_empty();
4820
4821 while( $Item = & mainlist_get_item() )
4822-{ // For each blog post, do everything below up to the closing curly brace "}"
4823+{ // For each blog post, do everything below up to the closing curly brace "}"
4824
4825 // ------------------------------ DATE SEPARATOR ------------------------------
4826 $MainList->date_if_changed( array(
4827- 'before' => '<h2>',
4828- 'after' => '</h2>',
4829+ 'before' => '<h2>',
4830+ 'after' => '</h2>',
4831 'date_format' => '#',
4832 ) );
4833
4834@@ -210,16 +210,16 @@
4835 <?php
4836 // Display footer text (text can be edited in Blog Settings):
4837 $Blog->footer_text( array(
4838- 'before' => '',
4839- 'after' => ' &bull; ',
4840+ 'before' => '',
4841+ 'after' => ' &bull; ',
4842 ) );
4843 ?>
4844
4845 <?php
4846 // Display a link to contact the owner of this blog (if owner accepts messages):
4847 $Blog->contact_link( array(
4848- 'before' => '',
4849- 'after' => ' &bull; ',
4850+ 'before' => '',
4851+ 'after' => ' &bull; ',
4852 'text' => T_('Contact'),
4853 'title' => T_('Send a message to the owner of this blog...'),
4854 ) );
4855@@ -234,4 +234,4 @@
4856 // --- --- --- --- --- --- --- --- --- --- ---
4857 // --- HTML FOOTER INCLUDED HERE ---
4858 template_include( '_html_footer.inc.php' );
4859-?>
4860\ No newline at end of file
4861+?>
4862
4863=== modified file 'templates/evocamp/_body_footer.inc.php'
4864--- templates/evocamp/_body_footer.inc.php 2010-01-02 08:34:34 +0000
4865+++ templates/evocamp/_body_footer.inc.php 2010-01-09 20:22:21 +0000
4866@@ -4,8 +4,6 @@
4867 *
4868 * This is meant to be included in a page template.
4869 *
4870- * -at- tutorial page placeholder _body_footer.inc.php
4871- *
4872 * @package templates
4873 * @subpackage evocamp
4874 */
4875@@ -16,17 +14,17 @@
4876 <?php
4877 // Display footer text (text can be edited in Blog Settings):
4878 $Blog->footer_text( array(
4879- 'before' => '',
4880- 'after' => ' - ',
4881+ 'before' => '',
4882+ 'after' => ' - ',
4883 ) );
4884 ?>
4885
4886 <?php
4887 // Display a link to contact the owner of this blog (if owner accepts messages):
4888 $Blog->contact_link( array(
4889- 'before' => '',
4890- 'after' => ' - ',
4891- 'text' => T_('Contact'),
4892+ 'before' => '',
4893+ 'after' => ' - ',
4894+ 'text' => T_('Contact'),
4895 'title' => T_('Send a message to the owner of this blog...'),
4896 ) );
4897 ?>
4898
4899=== modified file 'templates/evocamp/_item_block.inc.php'
4900--- templates/evocamp/_item_block.inc.php 2010-01-02 15:13:47 +0000
4901+++ templates/evocamp/_item_block.inc.php 2010-01-09 20:22:21 +0000
4902@@ -19,26 +19,25 @@
4903
4904 // Default params:
4905 $params = array_merge( array(
4906- 'feature_block' => false,
4907- 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail
4908- 'item_class' => 'post',
4909- 'image_size' => 'fit-400x320',
4910+ 'feature_block' => false,
4911+ 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail
4912+ 'item_class' => 'post',
4913+ 'image_size' => 'fit-400x320',
4914 'more_link_text' => T_('Read more'),
4915 ), $params );
4916-
4917 ?>
4918-<div id="<?php $Item->anchor_id() ?>" class="<?php $Item->div_classes( $params ) ?>" lang="<?php $Item->lang() ?>">
4919
4920- <?php
4921+<div id="<?php $Item->anchor_id(); ?>" class="<?php $Item->div_classes( $params ) ?>" lang="<?php $Item->lang(); ?>">
4922+<?php
4923 $Item->locale_temp_switch(); // Temporarily switch to post locale (useful for multilingual blogs)
4924 ?>
4925
4926 <?php
4927 if( $Item->is_intro() )
4928- { // Display edit link only if we're displaying an intro post:
4929+ { // Display edit link only if we're displaying an intro post:
4930 $Item->edit_link( array( // Link to backoffice for editing
4931- 'before' => '<div class="floatright">',
4932- 'after' => '</div>',
4933+ 'before' => '<div class="floatright">',
4934+ 'after' => '</div>',
4935 ) );
4936 }
4937 ?>
4938@@ -48,21 +47,21 @@
4939 <p class="postinfo">
4940 <?php
4941 if( ! $Item->is_intro() )
4942- { // Display only if we're not displaying an intro post:
4943- $Item->author( array(
4944- 'before' => T_('By').' ',
4945- 'after' => ' ',
4946+ { // Display only if we're not displaying an intro post:
4947+ $Item->author( array(
4948+ 'before' => T_('By').' ',
4949+ 'after' => ' ',
4950 ) );
4951 $Item->issue_time( array(
4952- 'before' => /* TRANS: date */ T_('on '),
4953- 'after' => '',
4954+ 'before' => /* TRANS: date */ T_('on '),
4955+ 'after' => '',
4956 'time_format' => 'M j, Y',
4957 ) );
4958 $Item->categories( array(
4959- 'before' => ' | '.T_('In '),
4960- 'after' => ' ',
4961- 'include_main' => true,
4962- 'include_other' => true,
4963+ 'before' => ' | '.T_('In '),
4964+ 'after' => ' ',
4965+ 'include_main' => true,
4966+ 'include_other' => true,
4967 'include_external'=> true,
4968 'link_categories' => true,
4969 ) );
4970@@ -78,8 +77,8 @@
4971 'use_popup' => false,
4972 ) );
4973 $Item->edit_link( array( // Link to backoffice for editing
4974- 'before' => ' | ',
4975- 'after' => '',
4976+ 'before' => ' | ',
4977+ 'after' => '',
4978 ) );
4979
4980 }
4981@@ -92,9 +91,9 @@
4982
4983 // List all tags attached to this post:
4984 $Item->tags( array(
4985- 'before' => '<div class="posttags">'.T_('Tags').': ',
4986- 'after' => '</div>',
4987- 'separator' => ', ',
4988+ 'before' => '<div class="posttags">'.T_('Tags').': ',
4989+ 'after' => '</div>',
4990+ 'separator' => ', ',
4991 ) );
4992 ?>
4993
4994
4995=== modified file 'templates/evocamp/index.main.php'
4996--- templates/evocamp/index.main.php 2010-01-02 15:13:47 +0000
4997+++ templates/evocamp/index.main.php 2010-01-09 20:22:21 +0000
4998@@ -5,8 +5,6 @@
4999 * The main page template is used to display the blog when no specific page template is available
5000 * to handle the request (based on $disp).
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches