Quam Plures

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

  1. qp-edb1
  2. Merge into trunk
Proposed by EdB
Status: Merged
Merge reported by: Yabs
Merged at revision: not available
Proposed branch: lp:~quam-plures-core/quam-plures/qp-edb1
Merge into: lp:quam-plures
Diff against target: 4977 lines (+1335/-2118)
47 files modified
blogs/a_notemplate.php (+55/-70)
blogs/contact.php (+17/-21)
blogs/default.php (+28/-37)
blogs/inc/items/model/_item.class.php (+4/-6)
blogs/inc/templates/_template.funcs.php (+2/-0)
blogs/multiblogs.php (+54/-67)
blogs/summary.php (+19/-20)
blogs/templates/_html_header.inc.php (+4/-9)
blogs/templates/_item_comment_form.inc.php (+7/-9)
blogs/templates/_item_feedback.inc.php (+14/-33)
blogs/templates/_wp_compatibility.inc.php (+16/-22)
blogs/templates/asevo/_item_block.inc.php (+21/-30)
blogs/templates/asevo/index.main.php (+45/-70)
blogs/templates/basic/index.main.php (+32/-45)
blogs/templates/custom/_item_block.inc.php (+20/-32)
blogs/templates/custom/index.main.php (+48/-72)
blogs/templates/evocamp/_item_block.inc.php (+7/-11)
blogs/templates/evocamp/index.main.php (+30/-63)
blogs/templates/evocamp/page.main.php (+49/-83)
blogs/templates/evocamp/posts.main.php (+47/-79)
blogs/templates/evocamp/single.main.php (+45/-81)
blogs/templates/evopress/_item_block.inc.php (+6/-12)
blogs/templates/evopress/index.main.php (+23/-55)
blogs/templates/evopress/page.main.php (+30/-62)
blogs/templates/evopress/posts.main.php (+34/-65)
blogs/templates/evopress/single.main.php (+36/-68)
blogs/templates/glossyblue/_item_block.inc.php (+12/-12)
blogs/templates/glossyblue/index.main.php (+22/-53)
blogs/templates/glossyblue/page.main.php (+23/-55)
blogs/templates/glossyblue/posts.main.php (+33/-65)
blogs/templates/glossyblue/single.main.php (+34/-71)
blogs/templates/miami_blue/_item_block.inc.php (+20/-30)
blogs/templates/miami_blue/index.main.php (+52/-76)
blogs/templates/natural_pink/_item_block.inc.php (+22/-32)
blogs/templates/natural_pink/index.main.php (+38/-63)
blogs/templates/nifty_corners/_item_block.inc.php (+26/-32)
blogs/templates/nifty_corners/index.main.php (+40/-63)
blogs/templates/photoblog/_html_header.inc.php (+4/-9)
blogs/templates/photoblog/_item_block.inc.php (+23/-33)
blogs/templates/photoblog/feedback_popup.main.php (+10/-20)
blogs/templates/photoblog/index.main.php (+42/-64)
blogs/templates/pixelgreen/_item_block.inc.php (+27/-31)
blogs/templates/pixelgreen/index.main.php (+56/-75)
blogs/templates/terrafirma/_item_block.inc.php (+26/-35)
blogs/templates/terrafirma/index.main.php (+52/-76)
blogs/templates/vastitude/_item_block.inc.php (+27/-27)
blogs/templates/vastitude/index.main.php (+53/-74)
To merge this branch: bzr merge lp:~quam-plures-core/quam-plures/qp-edb1
Reviewer Review Type Date Requested Status
Yabs (community) Approve
Review via email: mp+16734@code.launchpad.net
To post a comment you must log in.
Revision history for this message
EdB (edb) wrote :

First step of many done. Still guessing at the workflow model :|

lp:~quam-plures-core/quam-plures/qp-edb1 updated
7398. By Yabs

merged trunk

Revision history for this message
Yabs (yabs) wrote :

From a cursory glance you don't appear to have broken anything worth noting. We can take a closer look when you hit stage 6 ;)

¥

review: Approve

Preview Diff

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

Subscribers

People subscribed via source and target branches