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
=== modified file 'blogs/a_notemplate.php'
--- blogs/a_notemplate.php 2010-01-02 08:34:34 +0000
+++ blogs/a_notemplate.php 2010-01-03 09:20:30 +0000
@@ -13,7 +13,9 @@
13 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}13 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
14 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}14 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
15 *15 *
16 * @package pond16 * @todo EdB: figure out if this useful, shed if not else embrace
17 *
18 * @package templates
17 */19 */
1820
19# First, select which blog you want to display here!21# First, select which blog you want to display here!
@@ -99,28 +101,26 @@
99 <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php $Blog->disp( 'rss2_url', 'raw' ) ?>" />101 <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php $Blog->disp( 'rss2_url', 'raw' ) ?>" />
100 <link rel="alternate" type="application/atom+xml" title="Atom" href="<?php $Blog->disp( 'atom_url', 'raw' ) ?>" />102 <link rel="alternate" type="application/atom+xml" title="Atom" href="<?php $Blog->disp( 'atom_url', 'raw' ) ?>" />
101 <?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>103 <?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
102 <!-- InstanceEndEditable -->
103</head>104</head>
105
104<body>106<body>
105<!-- InstanceBeginEditable name="ToolBar" -->
106<?php107<?php
107 // ---------------------------- TOOLBAR INCLUDED HERE ----------------------------108// --- --- --- --- --- --- --- --- --- --- ---
108 require $templates_path.'_toolbar.inc.php';109// --- TOOLBAR INCLUDED HERE ---
109 // ------------------------------- END OF TOOLBAR --------------------------------110template_include( '_toolbar.inc.php' );
110 echo "\n";111echo "\n";
111 if( is_logged_in() )112if( is_logged_in() )
112 {113{
113 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';114 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';
114 }115}
115 else116else
116 {117{
117 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';118 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';
118 }119}
119 echo "\n";120echo "\n";
120?>121?>
121<!-- InstanceEndEditable -->122
122<div class="pageHeader">123<div class="pageHeader">
123<!-- InstanceBeginEditable name="NavBar2" -->
124<?php124<?php
125 // --------------------------------- START OF BLOG LIST --------------------------------125 // --------------------------------- START OF BLOG LIST --------------------------------
126 template_widget( array(126 template_widget( array(
@@ -238,22 +238,19 @@
238 'include_external'=> true,238 'include_external'=> true,
239 'link_categories' => true,239 'link_categories' => true,
240 ) );240 ) );
241 ?>241 ?>
242 </div>242 </div>
243 <h3 class="bTitle"><?php $Item->title(); ?></h3>243
244244 <h3 class="bTitle"><?php $Item->title(); ?></h3>
245 <?php245
246 // ---------------------- POST CONTENT INCLUDED HERE ----------------------246 <?php
247 template_include( '_item_content.inc.php', array(247 // --- --- --- --- --- --- --- --- --- --- ---
248 'image_size' => 'fit-400x320',248 // --- POST CONTENT INCLUDED HERE ---
249 ) );249 template_include( '_item_content.inc.php', array(
250 // Note: You can customize the default item feedback by copying the generic250 'image_size' => 'fit-400x320',
251 // /templates/_item_feedback.inc.php file into the current template folder.251 ) );
252 // -------------------------- END OF POST CONTENT -------------------------252
253 ?>253 // List all tags attached to this post:
254
255 <?php
256 // List all tags attached to this post:
257 $Item->tags( array(254 $Item->tags( array(
258 'before' => '<div class="bSmallPrint">'.T_('Tags').': ',255 'before' => '<div class="bSmallPrint">'.T_('Tags').': ',
259 'after' => '</div>',256 'after' => '</div>',
@@ -290,18 +287,18 @@
290 ?>287 ?>
291288
292 <?php $Item->permanent_link(); ?>289 <?php $Item->permanent_link(); ?>
293 </div>290 </div>
294 <?php291
295 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------292 <?php
296 template_include( '_item_feedback.inc.php', array(293 // --- --- --- --- --- --- --- --- --- --- ---
297 'before_section_title' => '<h4>',294 // --- ITEM FEEDBACK INCLUDED HERE ---
298 'after_section_title' => '</h4>',295 template_include( '_item_feedback.inc.php', array(
299 ) );296 'before_section_title' => '<h4>',
300 // Note: You can customize the default item feedback by copying the generic297 'after_section_title' => '</h4>',
301 // /templates/_item_feedback.inc.php file into the current template folder.298 ) );
302 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------299 ?>
303 ?>300 </div>
304 </div>301
305 <?php } // ---------------------------------- END OF POSTS ------------------------------------ ?>302 <?php } // ---------------------------------- END OF POSTS ------------------------------------ ?>
306303
307 <?php304 <?php
@@ -313,34 +310,22 @@
313 'next_text' => '&gt;&gt;',310 'next_text' => '&gt;&gt;',
314 ) );311 ) );
315 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------312 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
316 ?>313
317314// --- --- --- --- --- --- --- --- --- --- ---
318315// MAIN CONTENT INCLUDED HERE
319 <?php316template_include( '$disp$', array(
320 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------317 // we already handled these cases above
321 template_include( '$disp$', array(318 'disp_posts' => '',
322 'disp_posts' => '', // We already handled this case above319 'disp_single' => '',
323 'disp_single' => '', // We already handled this case above320 'disp_page' => '',
324 'disp_page' => '', // We already handled this case above321) );
325 ) );322?>
326 // Note: you can customize any of the sub templates included here by
327 // copying the matching php file into your template directory.
328 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
329 ?>
330
331</div>323</div>
332324
333<!-- =================================== START OF SIDEBAR =================================== -->
334
335<div class="bSideBar">325<div class="bSideBar">
336326
337 <div class="bSideItem">327<div class="bSideItem">
338328<h3><?php $Blog->disp( 'name', 'htmlbody' ); ?></h3>
339 <h3><?php
340 // BLOG TITLE:
341 $Blog->disp( 'name', 'htmlbody' );
342 // Note: we could have called the coll_title widget instead, but that would be overkill.
343 ?></h3>
344329
345 <p><?php330 <p><?php
346 // BLOG LONG DESCRIPTION:331 // BLOG LONG DESCRIPTION:
347332
=== modified file 'blogs/contact.php'
--- blogs/contact.php 2010-01-02 08:34:34 +0000
+++ blogs/contact.php 2010-01-03 09:20:30 +0000
@@ -10,7 +10,7 @@
10 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}10 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
11 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}11 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
12 *12 *
13 * @package pond13 * @package templates
14 */14 */
1515
16// The User ID of the administrator:16// The User ID of the administrator:
@@ -47,32 +47,28 @@
47<head>47<head>
48<!-- InstanceBeginEditable name="doctitle" -->48<!-- InstanceBeginEditable name="doctitle" -->
49<title><?php echo T_('Contact Form Demo'); ?></title>49<title><?php echo T_('Contact Form Demo'); ?></title>
50<!-- InstanceEndEditable -->
51<link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />50<link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />
52<!-- InstanceBeginEditable name="head" -->51<?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
53 <?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
54 <!-- InstanceEndEditable -->
55</head>52</head>
53
56<body>54<body>
57<!-- InstanceBeginEditable name="ToolBar" -->
58<?php55<?php
59 // ---------------------------- TOOLBAR INCLUDED HERE ----------------------------56// --- --- --- --- --- --- --- --- --- --- ---
60 require $templates_path.'_toolbar.inc.php';57// --- TOOLBAR INCLUDED HERE ---
61 // ------------------------------- END OF TOOLBAR --------------------------------58template_include( '_toolbar.inc.php' );
62 echo "\n";59echo "\n";
63 if( is_logged_in() )60if( is_logged_in() )
64 {61{
65 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';62 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';
66 }63}
67 else64else
68 {65{
69 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';66 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';
70 }67}
71 echo "\n";68echo "\n";
72?>69?>
73<!-- InstanceEndEditable -->70
74<div class="pageHeader">71<div class="pageHeader">
75<!-- InstanceBeginEditable name="NavBar2" -->
76<?php72<?php
77 // --------------------------------- START OF BLOG LIST --------------------------------73 // --------------------------------- START OF BLOG LIST --------------------------------
78 template_widget( array(74 template_widget( array(
7975
=== modified file 'blogs/default.php'
--- blogs/default.php 2010-01-02 08:34:34 +0000
+++ blogs/default.php 2010-01-03 09:20:30 +0000
@@ -11,7 +11,7 @@
11 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}11 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
12 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}12 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
13 *13 *
14 * @package pond14 * @package templates
15 */15 */
1616
17/**17/**
@@ -48,46 +48,37 @@
48 <!-- InstanceEndEditable -->48 <!-- InstanceEndEditable -->
49 <meta name="viewport" content="width = 750" />49 <meta name="viewport" content="width = 750" />
50 <link href="rsc/css/evo_distrib_2.css" rel="stylesheet" type="text/css" />50 <link href="rsc/css/evo_distrib_2.css" rel="stylesheet" type="text/css" />
51 <!-- InstanceBeginEditable name="head" -->
52 <base href="<?php echo $baseurl ?>" />51 <base href="<?php echo $baseurl ?>" />
53 <!-- InstanceEndEditable -->
54 <!-- InstanceParam name="lang" type="text" value="&lt;?php locale_lang() ?&gt;" -->
55</head>52</head>
5653
57<body>54<body>
58 <!-- InstanceBeginEditable name="BodyHead" -->55<?php
59 <?php56// --- --- --- --- --- --- --- --- --- --- ---
60 // ---------------------------- TOOLBAR INCLUDED HERE ----------------------------57// --- TOOLBAR INCLUDED HERE ---
61 require $templates_path.'_toolbar.inc.php';58template_include( '_toolbar.inc.php' );
62 // ------------------------------- END OF TOOLBAR --------------------------------59echo "\n";
6360if( is_logged_in() )
64 echo "\n";61{
65 if( is_logged_in() )62 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';
66 {63}
67 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';64else
68 }65{
69 else66 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';
70 {67}
71 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';68echo "\n";
72 }69?>
73 echo "\n";70
74 ?>71<div class="wrapper1">
75 <!-- Start of template_wrapper -->72
76 <!-- InstanceEndEditable -->73<div class="wrapper2">
7774<span class="version_top"><?php echo T_('Default page') ?></span>
78 <div class="wrapper1">75<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>
79 <div class="wrapper2">76
80 <span class="version_top"><!-- InstanceBeginEditable name="Version" --><?php echo T_('Default page') ?><!-- InstanceEndEditable --></span>77<div class="menu_top">
8178<span class="floatright"><a href="<?php echo $baseurl ?>">Home</a> &bull; <a href="<?php echo $admin_url ?>">Admin</a> </span>&nbsp;
82 <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>79</div>
8380
84 <div class="menu_top"><!-- InstanceBeginEditable name="MenuTop" -->81<?php
85 <span class="floatright"><a href="<?php echo $baseurl ?>">Home</a> &bull; <a href="<?php echo $admin_url ?>">Admin</a> </span>
86 &nbsp;
87 <!-- InstanceEndEditable --></div>
88
89 <!-- InstanceBeginEditable name="Main" -->
90 <?php
91 /**82 /**
92 * @var BlogCache83 * @var BlogCache
93 */84 */
9485
=== modified file 'blogs/inc/items/model/_item.class.php'
--- blogs/inc/items/model/_item.class.php 2010-01-02 08:34:34 +0000
+++ blogs/inc/items/model/_item.class.php 2010-01-03 09:20:31 +0000
@@ -1144,13 +1144,11 @@
1144 */1144 */
1145 function content()1145 function content()
1146 {1146 {
1147 // ---------------------- POST CONTENT INCLUDED HERE ----------------------1147 // --- --- --- --- --- --- --- --- --- --- ---
1148 // --- POST CONTENT INCLUDED HERE ---
1148 template_include( '_item_content.inc.php', array(1149 template_include( '_item_content.inc.php', array(
1149 'image_size' => 'fit-400x320',1150 'image_size' => 'fit-400x320',
1150 ) );1151 ) );
1151 // Note: You can customize the default item feedback by copying the generic
1152 // /templates/_item_feedback.inc.php file into the current template folder.
1153 // -------------------------- END OF POST CONTENT -------------------------
1154 }1152 }
11551153
11561154
11571155
=== modified file 'blogs/inc/templates/_template.funcs.php'
--- blogs/inc/templates/_template.funcs.php 2010-01-02 08:34:34 +0000
+++ blogs/inc/templates/_template.funcs.php 2010-01-03 09:20:31 +0000
@@ -388,6 +388,8 @@
388/**388/**
389 * Template tag. Include a sub-template at the current position389 * Template tag. Include a sub-template at the current position
390 *390 *
391 * A docblock test. This text will show up in the autodocs?
392 * If so, $disp_handler is very nice :)
391 */393 */
392function template_include( $template_name, $params = array() )394function template_include( $template_name, $params = array() )
393{395{
394396
=== modified file 'blogs/multiblogs.php'
--- blogs/multiblogs.php 2010-01-02 08:34:34 +0000
+++ blogs/multiblogs.php 2010-01-03 09:20:30 +0000
@@ -5,7 +5,7 @@
5 * If you're new to quam plures template system, you should not start with this file5 * If you're new to quam plures template system, you should not start with this file
6 * It will be easier to start examining blog_a.php or notemplate_a.php for instance...6 * It will be easier to start examining blog_a.php or notemplate_a.php for instance...
7 *7 *
8 * @package pond8 * @package templates
9 */9 */
1010
11# First blog will be displayed the regular way (why bother?)11# First blog will be displayed the regular way (why bother?)
@@ -92,28 +92,26 @@
92 <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php $Blog->disp( 'rss2_url', 'raw' ) ?>" />92 <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="<?php $Blog->disp( 'rss2_url', 'raw' ) ?>" />
93 <link rel="alternate" type="application/atom+xml" title="Atom" href="<?php $Blog->disp( 'atom_url', 'raw' ) ?>" />93 <link rel="alternate" type="application/atom+xml" title="Atom" href="<?php $Blog->disp( 'atom_url', 'raw' ) ?>" />
94 <?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>94 <?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
95 <!-- InstanceEndEditable -->
96</head>95</head>
96
97<body>97<body>
98<!-- InstanceBeginEditable name="ToolBar" -->
99<?php98<?php
100 // ---------------------------- TOOLBAR INCLUDED HERE ----------------------------99// --- --- --- --- --- --- --- --- --- --- ---
101 require $templates_path.'_toolbar.inc.php';100// --- TOOLBAR INCLUDED HERE ---
102 // ------------------------------- END OF TOOLBAR --------------------------------101template_include( '_toolbar.inc.php' );
103 echo "\n";102echo "\n";
104 if( is_logged_in() )103if( is_logged_in() )
105 {104{
106 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';105 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';
107 }106}
108 else107else
109 {108{
110 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';109 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';
111 }110}
112 echo "\n";111echo "\n";
113?>112?>
114<!-- InstanceEndEditable -->113
115<div class="pageHeader">114<div class="pageHeader">
116<!-- InstanceBeginEditable name="NavBar2" -->
117<?php115<?php
118 // --------------------------------- START OF BLOG LIST --------------------------------116 // --------------------------------- START OF BLOG LIST --------------------------------
119 template_widget( array(117 template_widget( array(
@@ -201,22 +199,20 @@
201 'include_external'=> true,199 'include_external'=> true,
202 'link_categories' => true,200 'link_categories' => true,
203 ) );201 ) );
204 ?>202 ?>
205 </div>203 </div>
206 <h3 class="bTitle"><?php $Item->title(); ?></h3>204
207205 <h3 class="bTitle"><?php $Item->title(); ?></h3>
208 <?php206 <?php
209 // ---------------------- POST CONTENT INCLUDED HERE ----------------------207 // --- --- --- --- --- --- --- --- --- --- ---
210 template_include( '_item_content.inc.php', array(208 // --- POST CONTENT INCLUDED HERE ---
211 'image_size' => 'fit-400x320',209 template_include( '_item_content.inc.php', array(
212 ) );210 'image_size' => 'fit-400x320',
213 // Note: You can customize the default item feedback by copying the generic211 ) );
214 // /templates/_item_feedback.inc.php file into the current template folder.212 ?>
215 // -------------------------- END OF POST CONTENT -------------------------213
216 ?>214 <div class="bSmallPrint">
217215 <?php
218 <div class="bSmallPrint">
219 <?php
220 // Link to comments, trackbacks, etc.:216 // Link to comments, trackbacks, etc.:
221 $Item->feedback_link( array(217 $Item->feedback_link( array(
222 'type' => 'comments',218 'type' => 'comments',
@@ -244,19 +240,18 @@
244 ?>240 ?>
245241
246 <?php $Item->permanent_link(); ?>242 <?php $Item->permanent_link(); ?>
247 </div>243 </div>
248244
249 <?php245 <?php
250 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------246 // --- --- --- --- --- --- --- --- --- --- ---
251 template_include( '_item_feedback.inc.php', array(247 // --- ITEM FEEDBACK INCLUDED HERE ---
252 'before_section_title' => '<h4>',248 template_include( '_item_feedback.inc.php', array(
253 'after_section_title' => '</h4>',249 'before_section_title' => '<h4>',
254 ) );250 'after_section_title' => '</h4>',
255 // Note: You can customize the default item feedback by copying the generic251 ) );
256 // /templates/_item_feedback.inc.php file into the current template folder.252 ?>
257 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------253 </div>
258 ?>254
259 </div>
260 <?php255 <?php
261 } // ---------------------------------- END OF POSTS ------------------------------------256 } // ---------------------------------- END OF POSTS ------------------------------------
262 ?>257 ?>
@@ -271,30 +266,22 @@
271 'next_text' => T_('Next').' &gt;&gt;',266 'next_text' => T_('Next').' &gt;&gt;',
272 ) );267 ) );
273 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------268 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
274 ?>269
275270// --- --- --- --- --- --- --- --- --- --- ---
276 <?php271// MAIN CONTENT INCLUDED HERE
277 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------272template_include( '$disp$', array(
278 template_include( '$disp$', array(273 // we already handled these cases above
279 'disp_posts' => '', // We already handled this case above274 'disp_posts' => '',
280 'disp_single' => '', // We already handled this case above275 'disp_single' => '',
281 'disp_page' => '', // We already handled this case above276 'disp_page' => '',
282 ) );277) );
283 // Note: you can customize any of the sub templates included here by278?>
284 // copying the matching php file into your template directory.
285 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
286 ?>
287
288</div>279</div>
289280
290<!-- =================================== START OF SIDEBAR =================================== -->
291
292<div class="bSideBar">281<div class="bSideBar">
293282
294 <!-- =================================== START OF BLOG B =================================== -->283<div class="bSideItem">
295284<?php
296 <div class="bSideItem">
297 <?php
298 $BlogCache = & get_Cache( 'BlogCache' );285 $BlogCache = & get_Cache( 'BlogCache' );
299 $Blog_B = & $BlogCache->get_by_ID( 2, false );286 $Blog_B = & $BlogCache->get_by_ID( 2, false );
300 if( empty($Blog_B) )287 if( empty($Blog_B) )
301288
=== modified file 'blogs/summary.php'
--- blogs/summary.php 2010-01-02 08:34:34 +0000
+++ blogs/summary.php 2010-01-03 09:20:31 +0000
@@ -10,7 +10,7 @@
10 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}10 * @copyright (c) 2009 by the Quam Plures developers - {@link http://quamplures.net/}
11 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}11 * @copyright (c)2003-2009 by Francois PLANQUE - {@link http://fplanque.net/}
12 *12 *
13 * @package pond13 * @package templates
14 */14 */
1515
16/**16/**
@@ -19,6 +19,9 @@
19 */19 */
20require_once dirname(__FILE__).'/conf/_config.php';20require_once dirname(__FILE__).'/conf/_config.php';
2121
22/**
23 * dummy docblock needs lovin'
24 */
22require_once $inc_path.'_main.inc.php';25require_once $inc_path.'_main.inc.php';
2326
24load_funcs( 'templates/_template.funcs.php' );27load_funcs( 'templates/_template.funcs.php' );
@@ -44,32 +47,28 @@
44<head>47<head>
45<!-- InstanceBeginEditable name="doctitle" -->48<!-- InstanceBeginEditable name="doctitle" -->
46<title><?php echo T_('Summary Demo'); ?></title>49<title><?php echo T_('Summary Demo'); ?></title>
47<!-- InstanceEndEditable -->
48<link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />50<link rel="stylesheet" href="rsc/css/fp02.css" type="text/css" />
49<!-- InstanceBeginEditable name="head" -->
50<?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>51<?php include_headlines() /* Add javascript and css files included by plugins and template */ ?>
51<!-- InstanceEndEditable -->
52</head>52</head>
53
53<body>54<body>
54<!-- InstanceBeginEditable name="ToolBar" -->
55<?php55<?php
56 // ---------------------------- TOOLBAR INCLUDED HERE ----------------------------56// --- --- --- --- --- --- --- --- --- --- ---
57 require $templates_path.'_toolbar.inc.php';57// --- TOOLBAR INCLUDED HERE ---
58 // ------------------------------- END OF TOOLBAR --------------------------------58template_include( '_toolbar.inc.php' );
59 echo "\n";59echo "\n";
60 if( is_logged_in() )60if( is_logged_in() )
61 {61{
62 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';62 echo '<div id="template_wrapper" class="template_wrapper_loggedin">';
63 }63}
64 else64else
65 {65{
66 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';66 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';
67 }67}
68 echo "\n";68echo "\n";
69?>69?>
70<!-- InstanceEndEditable -->70
71<div class="pageHeader">71<div class="pageHeader">
72<!-- InstanceBeginEditable name="NavBar2" -->
73<?php72<?php
74 // --------------------------------- START OF BLOG LIST --------------------------------73 // --------------------------------- START OF BLOG LIST --------------------------------
75 template_widget( array(74 template_widget( array(
7675
=== modified file 'blogs/templates/_html_header.inc.php'
--- blogs/templates/_html_header.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/_html_header.inc.php 2010-01-03 09:20:31 +0000
@@ -5,8 +5,6 @@
5 * This is meant to be included in a page template.5 * This is meant to be included in a page template.
6 * Note: This is also included in the popup: do not include site navigation!6 * Note: This is also included in the popup: do not include site navigation!
7 *7 *
8 * -at- tutorial page placeholder _html_header.inc.php
9 *
10 * @package templates8 * @package templates
11 */9 */
12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );10if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
@@ -54,12 +52,10 @@
54</head>52</head>
5553
56<body>54<body>
57
58<?php55<?php
59// ---------------------------- TOOLBAR INCLUDED HERE ----------------------------56// --- --- --- --- --- --- --- --- --- --- ---
60require $templates_path.'_toolbar.inc.php';57// --- TOOLBAR INCLUDED HERE ---
61// ------------------------------- END OF TOOLBAR --------------------------------58template_include( '_toolbar.inc.php' );
62
63echo "\n";59echo "\n";
64if( is_logged_in() )60if( is_logged_in() )
65{61{
@@ -70,5 +66,4 @@
70 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';66 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';
71}67}
72echo "\n";68echo "\n";
73?>69?>
74<!-- Start of template_wrapper -->
75\ No newline at end of file70\ No newline at end of file
7671
=== modified file 'blogs/templates/_item_comment_form.inc.php'
--- blogs/templates/_item_comment_form.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/_item_comment_form.inc.php 2010-01-03 09:20:31 +0000
@@ -27,7 +27,7 @@
27 'textarea_lines' => 10,27 'textarea_lines' => 10,
28 'default_text' => '',28 'default_text' => '',
29 'preview_start' => '<div class="bComment" id="comment_preview">',29 'preview_start' => '<div class="bComment" id="comment_preview">',
30 'comment_template' => '_item_comment.inc.php', // The template used for displaying individual comments (including preview)30 'comment_template' => '_item_comment.inc.php',
31 'preview_end' => '</div>',31 'preview_end' => '</div>',
32 ), $params );32 ), $params );
3333
@@ -46,15 +46,13 @@
46 // We do not want the current rendered page to be cached!!46 // We do not want the current rendered page to be cached!!
47 $PageCache->abort_collect();47 $PageCache->abort_collect();
4848
49 // ------------------ PREVIEW COMMENT INCLUDED HERE ------------------49 // --- --- --- --- --- --- --- --- --- --- ---
50 // --- A SINGLE COMMENT INCLUDED HERE ---
50 template_include( $params['comment_template'], array(51 template_include( $params['comment_template'], array(
51 'Comment' => & $Comment,52 'Comment' => & $Comment,
52 'comment_start' => $params['preview_start'],53 'comment_start' => $params['comment_start'],
53 'comment_end' => $params['preview_end'],54 'comment_end' => $params['comment_end'],
54 ) );55 ) );
55 // Note: You can customize the default item feedback by copying the generic
56 // /templates/_item_comment.inc.php file into the current template folder.
57 // ---------------------- END OF PREVIEW COMMENT ---------------------
5856
59 // Form fields:57 // Form fields:
60 $comment_content = $Comment->original_content;58 $comment_content = $Comment->original_content;
6159
=== modified file 'blogs/templates/_item_feedback.inc.php'
--- blogs/templates/_item_feedback.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/_item_feedback.inc.php 2010-01-03 09:20:31 +0000
@@ -21,10 +21,6 @@
21 */21 */
22if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );22if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
2323
24?>
25<!-- ===================== START OF FEEDBACK ===================== -->
26<?php
27
28// Default params:24// Default params:
29$params = array_merge( array(25$params = array_merge( array(
30 'disp_comments' => true,26 'disp_comments' => true,
@@ -40,7 +36,7 @@
40 'comment_end' => '</div>',36 'comment_end' => '</div>',
41 'preview_start' => '<div class="bComment" id="comment_preview">',37 'preview_start' => '<div class="bComment" id="comment_preview">',
42 'preview_end' => '</div>',38 'preview_end' => '</div>',
43 'comment_template' => '_item_comment.inc.php', // The template used for displaying individual comments (including preview)39 'comment_template' => '_item_comment.inc.php',
44 'form_title_start' => '<h3>',40 'form_title_start' => '<h3>',
45 'form_title_end' => '</h3>',41 'form_title_end' => '</h3>',
46 ), $params );42 ), $params );
@@ -158,34 +154,27 @@
158154
159 echo $params['comment_list_start'];155 echo $params['comment_list_start'];
160 /**156 /**
157 * loop through comments...
161 * @var Comment158 * @var Comment
162 */159 */
163 while( $Comment = & $CommentList->get_next() )160 while( $Comment = & $CommentList->get_next() )
164 { // Loop through comments:161 {
165162 // --- --- --- --- --- --- --- --- --- --- ---
166 // ------------------ COMMENT INCLUDED HERE ------------------163 // --- A SINGLE COMMENT INCLUDED HERE ---
167 template_include( $params['comment_template'], array(164 template_include( $params['comment_template'], array(
168 'Comment' => & $Comment,165 'Comment' => & $Comment,
169 'comment_start' => $params['comment_start'],166 'comment_start' => $params['comment_start'],
170 'comment_end' => $params['comment_end'],167 'comment_end' => $params['comment_end'],
171 ) );168 ) );
172 // Note: You can customize the default item feedback by copying the generic169 }
173 // /templates/_item_comment.inc.php file into the current template folder.
174 // ---------------------- END OF COMMENT ---------------------
175
176 } // End of comment list loop.
177 echo $params['comment_list_end'];170 echo $params['comment_list_end'];
178171
179
180 // _______________________________________________________________
181
182 // Display count of comments to be moderated:172 // Display count of comments to be moderated:
183 $Item->feedback_moderation( 'feedbacks', '<div class="moderation_msg"><p>', '</p></div>', '',173 $Item->feedback_moderation( 'feedbacks', '<div class="moderation_msg"><p>', '</p></div>', '',
184 T_('This post has 1 feedback awaiting moderation... %s'),174 T_('This post has 1 feedback awaiting moderation... %s'),
185 T_('This post has %d feedbacks awaiting moderation... %s') );175 T_('This post has %d feedbacks awaiting moderation... %s') );
186176
187 // _______________________________________________________________177 // foo?
188
189 if( $Blog->get_setting( 'feed_content' ) != 'none' ) 178 if( $Blog->get_setting( 'feed_content' ) != 'none' )
190 { // fp: TODO; move this tesqt into feedback_feed_link()179 { // fp: TODO; move this tesqt into feedback_feed_link()
191 // Display link for comments feed:180 // Display link for comments feed:
@@ -193,17 +182,9 @@
193182
194 }183 }
195184
196 // _______________________________________________________________
197
198}185}
199186
200187// --- --- --- --- --- --- --- --- --- --- ---
201188// --- COMMENT FORM INCLUDED HERE ---
202// ------------------ COMMENT FORM INCLUDED HERE ------------------
203template_include( '_item_comment_form.inc.php', $params );189template_include( '_item_comment_form.inc.php', $params );
204// Note: You can customize the default item feedback by copying the generic190?>
205// /templates/_item_comment_form.inc.php file into the current template folder.
206// ---------------------- END OF COMMENT FORM ---------------------
207
208
209?>
210\ No newline at end of file191\ No newline at end of file
211192
=== modified file 'blogs/templates/_wp_compatibility.inc.php'
--- blogs/templates/_wp_compatibility.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/_wp_compatibility.inc.php 2010-01-03 09:20:31 +0000
@@ -7,8 +7,6 @@
7 * This should not be used in redistributed templates as this 7 * This should not be used in redistributed templates as this
8 * will NOT provide FULL QP functionality.8 * will NOT provide FULL QP functionality.
9 *9 *
10 * -at- tutorial page placeholder _wp_compatibility.inc.php
11 *
12 * @package templates10 * @package templates
13 */11 */
14if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
@@ -109,13 +107,11 @@
109 */107 */
110function the_content()108function the_content()
111{109{
112 // ---------------------- POST CONTENT INCLUDED HERE ----------------------110 // --- --- --- --- --- --- --- --- --- --- ---
111 // --- POST CONTENT INCLUDED HERE ---
113 template_include( '_item_content.inc.php', array(112 template_include( '_item_content.inc.php', array(
114 'image_size' => 'fit-400x320',113 'image_size' => 'fit-400x320',
115 ) );114 ) );
116 // Note: You can customize the default item feedback by copying the generic
117 // /templates/_item_feedback.inc.php file into the current template folder.
118 // -------------------------- END OF POST CONTENT -------------------------
119}115}
120116
121117
@@ -259,21 +255,19 @@
259 */255 */
260function comments_template()256function comments_template()
261{257{
262 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------258 // --- --- --- --- --- --- --- --- --- --- ---
259 // --- ITEM FEEDBACK INCLUDED HERE ---
263 template_include( '_item_feedback.inc.php', array(260 template_include( '_item_feedback.inc.php', array(
264 'before_section_title' => '<h3>',261 'before_section_title' => '<h3>',
265 'after_section_title' => '</h3>',262 'after_section_title' => '</h3>',
266 'comment_list_start' => "\n<ol>\n",263 'comment_list_start' => "\n<ol>\n",
267 'comment_list_end' => "\n</ol>\n",264 'comment_list_end' => "\n</ol>\n",
268 'comment_start' => '<li>',265 'comment_start' => '<li>',
269 'comment_end' => '</li>',266 'comment_end' => '</li>',
270 'preview_start' => '<ul><li id="comment_preview">',267 'preview_start' => '<ul><li id="comment_preview">',
271 'preview_end' => '</li></ul>',268 'preview_end' => '</li></ul>',
272 'comment_template' => '_item_comment_wp.inc.php', // The template used for displaying individual comments (including preview)269 'comment_template' => '_item_comment_wp.inc.php',
273 ) );270 ) );
274 // Note: You can customize the default item feedback by copying the generic
275 // /templates/_item_feedback.inc.php file into the current template folder.
276 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
277}271}
278272
279273
280274
=== modified file 'blogs/templates/asevo/_item_block.inc.php'
--- blogs/templates/asevo/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/asevo/_item_block.inc.php 2010-01-03 09:20:31 +0000
@@ -79,19 +79,17 @@
79 'after' => ' ',79 'after' => ' ',
80 'separator' => ', ',80 'separator' => ', ',
81 ) );81 ) );
82 ?>82?>
83 </div>83</div>
8484
85 <?php85<?php
86 // ---------------------- POST CONTENT INCLUDED HERE ----------------------86// --- --- --- --- --- --- --- --- --- --- ---
87 template_include( '_item_content.inc.php', $params );87// --- POST CONTENT INCLUDED HERE ---
88 // Note: You can customize the default item feedback by copying the generic88template_include( '_item_content.inc.php', $params );
89 // /templates/_item_content.inc.php file into the current template folder.89?>
90 // -------------------------- END OF POST CONTENT -------------------------90
91 ?>91<div class="evo_post_foot">
9292<?php
93 <div class="evo_post_foot">
94 <?php
95 // Link to comments, trackbacks, etc.:93 // Link to comments, trackbacks, etc.:
96 $Item->feedback_link( array(94 $Item->feedback_link( array(
97 'type' => 'comments',95 'type' => 'comments',
@@ -116,25 +114,18 @@
116 'link_title' => '#',114 'link_title' => '#',
117 'use_popup' => false,115 'use_popup' => false,
118 ) );116 ) );
119 ?>117?>
120 </div>
121
122 <?php
123 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------
124 template_include( '_item_feedback.inc.php', array(
125 'before_section_title' => '<h4>',
126 'after_section_title' => '</h4>',
127 ) );
128 // Note: You can customize the default item feedback by copying the generic
129 // /templates/_item_feedback.inc.php file into the current template folder.
130 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
131 ?>
132
133 <?php
134 locale_restore_previous(); // Restore previous locale (Blog locale)
135 ?>
136</div>118</div>
137119
138<?php120<?php
121// --- --- --- --- --- --- --- --- --- --- ---
122// --- ITEM FEEDBACK INCLUDED HERE ---
123template_include( '_item_feedback.inc.php', array(
124 'before_section_title' => '<h4>',
125 'after_section_title' => '</h4>',
126) );
139127
128// restore previous (Blog) locale
129locale_restore_previous();
140?>130?>
131</div>
141132
=== modified file 'blogs/templates/asevo/index.main.php'
--- blogs/templates/asevo/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/asevo/index.main.php 2010-01-03 09:20:31 +0000
@@ -9,21 +9,13 @@
9 */9 */
10if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );10if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1111
12if( version_compare( $app_version, '3.0' ) < 0 )
13{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
14 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
15}
16
17// This is the main template; it may be used to display very different things.12// This is the main template; it may be used to display very different things.
18// Do inits depending on current $disp:13// Do inits depending on current $disp:
19template_init( $disp );14template_init( $disp );
2015
2116// --- --- --- --- --- --- --- --- --- --- ---
22// -------------------------- HTML HEADER INCLUDED HERE --------------------------17// --- HTML HEADER INCLUDED HERE ---
23template_include( '_html_header.inc.php' );18template_include( '_html_header.inc.php' );
24// Note: You can customize the default HTML header by copying the
25// _html_header.inc.php file into the current template folder.
26// -------------------------------- END OF HEADER --------------------------------
27?>19?>
2820
29<div class="head_zone">21<div class="head_zone">
@@ -126,41 +118,36 @@
126 'format' => 'htmlbody',118 'format' => 'htmlbody',
127 ) );119 ) );
128 // ------------------------------ END OF REQUEST TITLE -----------------------------120 // ------------------------------ END OF REQUEST TITLE -----------------------------
129 ?>121
130122// do we have a featured/intro item to display?
131 <!-- =================================== START OF MAIN AREA =================================== -->123if( $Item = & get_featured_Item() )
132124{
133 <?php // ------------------------------------ START OF POSTS ----------------------------------------125 // --- --- --- --- --- --- --- --- --- --- ---
134 // Go Grab the featured post:126 // --- ITEM BLOCK INCLUDED HERE ---
135 if( $Item = & get_featured_Item() )127 template_include( '_item_block.inc.php', array(
136 { // We have a featured/intro post to display:128 'feature_block' => true,
137 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------129 'content_mode' => 'auto',
138 template_include( '_item_block.inc.php', array(130 'intro_mode' => 'normal',
139 'feature_block' => true,131 'item_class' => 'featured_post',
140 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail132 'image_size' => 'fit-400x320',
141 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode133 ) );
142 'item_class' => 'featured_post',134}
143 'image_size' => 'fit-400x320',135
144 ) );136// Display message if no post:
145 // ----------------------------END ITEM BLOCK ----------------------------
146 }
147
148 // Display message if no post:
149 display_if_empty();137 display_if_empty();
150138
151 while( $Item = & mainlist_get_item() )139// do this loop for each item we need to display (aka 'the posts loop')
152 { // For each blog post:140while( $Item = & mainlist_get_item() )
153 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------141{
154 template_include( '_item_block.inc.php', array(142 // --- --- --- --- --- --- --- --- --- --- ---
155 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail143 // --- ITEM BLOCK INCLUDED HERE ---
156 'image_size' => 'fit-400x320',144 template_include( '_item_block.inc.php', array(
157 ) );145 'content_mode' => 'auto',
158 // ----------------------------END ITEM BLOCK ----------------------------146 'image_size' => 'fit-400x320',
159 }147 ) );
160 ?>148}
161149
162 <?php150// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
163 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
164 mainlist_page_links( array(151 mainlist_page_links( array(
165 'block_start' => '<p class="center"><strong>',152 'block_start' => '<p class="center"><strong>',
166 'block_end' => '</strong></p>',153 'block_end' => '</strong></p>',
@@ -169,26 +156,20 @@
169 'next_text' => T_('Next').' &gt;&gt;',156 'next_text' => T_('Next').' &gt;&gt;',
170 ) );157 ) );
171 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------158 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
172 ?>159
173160// --- --- --- --- --- --- --- --- --- --- ---
174 <?php161// MAIN CONTENT INCLUDED HERE
175 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------162template_include( '$disp$', array(
176 template_include( '$disp$', array(163 // we already handled these cases above
177 'disp_posts' => '', // We already handled this case above164 'disp_posts' => '',
178 'disp_single' => '', // We already handled this case above165 'disp_single' => '',
179 'disp_page' => '', // We already handled this case above166 'disp_page' => '',
180 ) );167) );
181 // Note: you can customize any of the sub templates included here by168?>
182 // copying the matching php file into your template directory.
183 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
184 ?>
185
186</div>169</div>
187<!-- =================================== START OF SIDEBAR =================================== -->
188170
189<div class="evo_sidebar">171<div class="evo_sidebar">
190172<?php
191 <?php
192 // Display container contents:173 // Display container contents:
193 template_container( NT_('Sidebar'), array(174 template_container( NT_('Sidebar'), array(
194 // The following (optional) params will be used as defaults for widgets included in this container:175 // The following (optional) params will be used as defaults for widgets included in this container:
@@ -209,26 +190,20 @@
209 'group_end' => '</ul>',190 'group_end' => '</ul>',
210 ) );191 ) );
211 ?>192 ?>
212
213</div>193</div>
214194
215<div class="clear"><img src="<?php echo $rsc_url; ?>img/blank.gif" width="1" height="1" alt="" /></div>195<div class="clear"><img src="<?php echo $rsc_url; ?>img/blank.gif" width="1" height="1" alt="" /></div>
216196
217</div>197</div>
198
218</div>199</div>
219200
220<?php201<?php
221// ------------------------- BODY FOOTER INCLUDED HERE --------------------------202// --- --- --- --- --- --- --- --- --- --- ---
203// --- BODY FOOTER INCLUDED HERE ---
222template_include( '_body_footer.inc.php' );204template_include( '_body_footer.inc.php' );
223// Note: You can customize the default BODY footer by copying the
224// _body_footer.inc.php file into the current template folder.
225// ------------------------------- END OF FOOTER --------------------------------
226?>
227205
228<?php206// --- --- --- --- --- --- --- --- --- --- ---
229// ------------------------- HTML FOOTER INCLUDED HERE --------------------------207// --- HTML FOOTER INCLUDED HERE ---
230template_include( '_html_footer.inc.php' );208template_include( '_html_footer.inc.php' );
231// Note: You can customize the default HTML footer by copying the
232// _html_footer.inc.php file into the current template folder.
233// ------------------------------- END OF FOOTER --------------------------------
234?>209?>
235\ No newline at end of file210\ No newline at end of file
236211
=== modified file 'blogs/templates/basic/index.main.php'
--- blogs/templates/basic/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/basic/index.main.php 2010-01-03 09:20:31 +0000
@@ -152,20 +152,15 @@
152 'include_external'=> true,152 'include_external'=> true,
153 'link_categories' => true,153 'link_categories' => true,
154 ) );154 ) );
155 ?>155
156156 // --- --- --- --- --- --- --- --- --- --- ---
157 <?php157 // --- POST CONTENT INCLUDED HERE ---
158 // ---------------------- POST CONTENT INCLUDED HERE ----------------------158 template_include( '_item_content.inc.php', array(
159 template_include( '_item_content.inc.php', array(159 'image_size' => 'fit-400x320',
160 'image_size' => 'fit-400x320',160 ) );
161 ) );161 ?>
162 // Note: You can customize the default item feedback by copying the generic162 <small>
163 // /templates/_item_feedback.inc.php file into the current template folder.163 <?php
164 // -------------------------- END OF POST CONTENT -------------------------
165 ?>
166
167 <small>
168 <?php
169 // Link to comments, trackbacks, etc.:164 // Link to comments, trackbacks, etc.:
170 $Item->feedback_link( array(165 $Item->feedback_link( array(
171 'type' => 'feedbacks',166 'type' => 'feedbacks',
@@ -187,41 +182,33 @@
187 ?>182 ?>
188183
189 <?php $Item->permanent_link(); ?>184 <?php $Item->permanent_link(); ?>
190 </small>185 </small>
191186 </blockquote>
192 </blockquote>187
193188 <?php
194 <?php189 // --- --- --- --- --- --- --- --- --- --- ---
195 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------190 // --- ITEM FEEDBACK INCLUDED HERE ---
196 template_include( '_item_feedback.inc.php', array(191 template_include( '_item_feedback.inc.php', array(
197 'before_section_title' => '<h4>',192 'before_section_title' => '<h4>',
198 'after_section_title' => '</h4>',193 'after_section_title' => '</h4>',
199 ) );194 ) );
200 // Note: You can customize the default item feedback by copying the generic195
201 // /templates/_item_feedback.inc.php file into the current template folder.196 locale_restore_previous(); // Restore previous locale (Blog locale)
202 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
203 ?>
204
205 <?php
206 locale_restore_previous(); // Restore previous locale (Blog locale)
207 ?>197 ?>
208198
209 </div>199 </div>
210200
211 <?php } // --------------------------------- END OF POSTS ----------------------------------- ?>201 <?php } // --------------------------------- END OF POSTS -----------------------------------
212202
213203// --- --- --- --- --- --- --- --- --- --- ---
214 <?php204// MAIN CONTENT INCLUDED HERE
215 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------205template_include( '$disp$', array(
216 template_include( '$disp$', array(206 // we already handled these cases above
217 'disp_posts' => '', // We already handled this case above207 'disp_posts' => '',
218 'disp_single' => '', // We already handled this case above208 'disp_single' => '',
219 'disp_page' => '', // We already handled this case above209 'disp_page' => '',
220 ) );210) );
221 // Note: you can customize any of the sub templates included here by211?>
222 // copying the matching php file into your template directory.
223 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
224 ?>
225212
226213
227 <hr>214 <hr>
228215
=== modified file 'blogs/templates/custom/_item_block.inc.php'
--- blogs/templates/custom/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/custom/_item_block.inc.php 2010-01-03 09:20:31 +0000
@@ -75,21 +75,16 @@
75 'include_external'=> true,75 'include_external'=> true,
76 'link_categories' => true,76 'link_categories' => true,
77 ) );77 ) );
78 ?>78?>
79 </div>79</div>
8080
81 <h3 class="bTitle"><?php $Item->title(); ?></h3>81<h3 class="bTitle"><?php $Item->title(); ?></h3>
8282<?php
83 <?php83// --- --- --- --- --- --- --- --- --- --- ---
84 // ---------------------- POST CONTENT INCLUDED HERE ----------------------84// --- POST CONTENT INCLUDED HERE ---
85 template_include( '_item_content.inc.php', $params );85template_include( '_item_content.inc.php', $params );
86 // Note: You can customize the default item feedback by copying the generic86
87 // /templates/_item_content.inc.php file into the current template folder.87// List all tags attached to this post:
88 // -------------------------- END OF POST CONTENT -------------------------
89 ?>
90
91 <?php
92 // List all tags attached to this post:
93 $Item->tags( array(88 $Item->tags( array(
94 'before' => '<div class="bSmallPrint">'.T_('Tags').': ',89 'before' => '<div class="bSmallPrint">'.T_('Tags').': ',
95 'after' => '</div>',90 'after' => '</div>',
@@ -132,25 +127,18 @@
132 'before' => ' &bull; ',127 'before' => ' &bull; ',
133 'after' => '',128 'after' => '',
134 ) );129 ) );
135 ?>130?>
136 </div>
137
138 <?php
139 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------
140 template_include( '_item_feedback.inc.php', array(
141 'before_section_title' => '<h4>',
142 'after_section_title' => '</h4>',
143 ) );
144 // Note: You can customize the default item feedback by copying the generic
145 // /templates/_item_feedback.inc.php file into the current template folder.
146 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
147 ?>
148
149 <?php
150 locale_restore_previous(); // Restore previous locale (Blog locale)
151 ?>
152</div>131</div>
153132
154<?php133<?php
134// --- --- --- --- --- --- --- --- --- --- ---
135// --- ITEM FEEDBACK INCLUDED HERE ---
136template_include( '_item_feedback.inc.php', array(
137 'before_section_title' => '<h4>',
138 'after_section_title' => '</h4>',
139) );
155140
141// restore previous (Blog) locale
142locale_restore_previous();
156?>143?>
144</div>
157145
=== modified file 'blogs/templates/custom/index.main.php'
--- blogs/templates/custom/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/custom/index.main.php 2010-01-03 09:20:31 +0000
@@ -13,21 +13,13 @@
13 */13 */
14if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );14if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1515
16if( version_compare( $app_version, '3.0' ) < 0 )
17{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
18 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
19}
20
21// This is the main template; it may be used to display very different things.16// This is the main template; it may be used to display very different things.
22// Do inits depending on current $disp:17// Do inits depending on current $disp:
23template_init( $disp );18template_init( $disp );
2419
2520// --- --- --- --- --- --- --- --- --- --- ---
26// -------------------------- HTML HEADER INCLUDED HERE --------------------------21// --- HTML HEADER INCLUDED HERE ---
27template_include( '_html_header.inc.php' );22template_include( '_html_header.inc.php' );
28// Note: You can customize the default HTML header by copying the generic
29// /templates/_html_header.inc.php file into the current template folder.
30// -------------------------------- END OF HEADER --------------------------------
31?>23?>
3224
3325
@@ -125,26 +117,22 @@
125 'format' => 'htmlbody',117 'format' => 'htmlbody',
126 ) );118 ) );
127 // ----------------------------- END OF REQUEST TITLE ----------------------------119 // ----------------------------- END OF REQUEST TITLE ----------------------------
128 ?>120
129121// do we have a featured/intro item to display?
130 <?php122if( $Item = & get_featured_Item() )
131 // Go Grab the featured post:123{
132 if( $Item = & get_featured_Item() )124 // --- --- --- --- --- --- --- --- --- --- ---
133 { // We have a featured/intro post to display:125 // --- ITEM BLOCK INCLUDED HERE ---
134 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------126 template_include( '_item_block.inc.php', array(
135 template_include( '_item_block.inc.php', array(127 'feature_block' => true,
136 'feature_block' => true,128 'content_mode' => 'auto',
137 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail129 'intro_mode' => 'normal',
138 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode130 'item_class' => 'featured_post',
139 'item_class' => 'featured_post',131 'image_size' => 'fit-400x320',
140 'image_size' => 'fit-400x320',132 ) );
141 ) );133}
142 // ----------------------------END ITEM BLOCK ----------------------------134
143 }135// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
144 ?>
145
146 <?php
147 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
148 mainlist_page_links( array(136 mainlist_page_links( array(
149 'block_start' => '<p class="center">'.T_('Pages:').' <strong>',137 'block_start' => '<p class="center">'.T_('Pages:').' <strong>',
150 'block_end' => '</strong></p>',138 'block_end' => '</strong></p>',
@@ -168,18 +156,18 @@
168 'date_format' => '#',156 'date_format' => '#',
169 ) );157 ) );
170158
171 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------159// do this loop for each item we need to display (aka 'the posts loop')
172 template_include( '_item_block.inc.php', array(160while( $Item = & mainlist_get_item() )
173 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail161{
174 'image_size' => 'fit-400x320',162 // --- --- --- --- --- --- --- --- --- --- ---
175 ) );163 // --- ITEM BLOCK INCLUDED HERE ---
176 // ----------------------------END ITEM BLOCK ----------------------------164 template_include( '_item_block.inc.php', array(
177165 'content_mode' => 'auto',
178 } // ---------------------------------- END OF POSTS ------------------------------------166 'image_size' => 'fit-400x320',
179 ?>167 ) );
180168}
181 <?php169
182 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------170// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
183 mainlist_page_links( array(171 mainlist_page_links( array(
184 'block_start' => '<p class="center"><strong>',172 'block_start' => '<p class="center"><strong>',
185 'block_end' => '</strong></p>',173 'block_end' => '</strong></p>',
@@ -187,28 +175,20 @@
187 'next_text' => '&gt;&gt;',175 'next_text' => '&gt;&gt;',
188 ) );176 ) );
189 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------177 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
190 ?>178
191179// --- --- --- --- --- --- --- --- --- --- ---
192180// MAIN CONTENT INCLUDED HERE
193 <?php181template_include( '$disp$', array(
194 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------182 // we already handled these cases above
195 template_include( '$disp$', array(183 'disp_posts' => '',
196 'disp_posts' => '', // We already handled this case above184 'disp_single' => '',
197 'disp_single' => '', // We already handled this case above185 'disp_page' => '',
198 'disp_page' => '', // We already handled this case above186) );
199 ) );187?>
200 // Note: you can customize any of the sub templates included here by
201 // copying the matching php file into your template directory.
202 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
203 ?>
204
205</div>188</div>
206189
207
208<!-- =================================== START OF SIDEBAR =================================== -->
209<div class="bSideBar">190<div class="bSideBar">
210191<?php
211 <?php
212 // ------------------------- "Sidebar" CONTAINER EMBEDDED HERE --------------------------192 // ------------------------- "Sidebar" CONTAINER EMBEDDED HERE --------------------------
213 // Display container contents:193 // Display container contents:
214 template_container( NT_('Sidebar'), array(194 template_container( NT_('Sidebar'), array(
@@ -265,18 +245,14 @@
265 'title' => T_('Send a message to the owner of this blog...'),245 'title' => T_('Send a message to the owner of this blog...'),
266 ) );246 ) );
267 ?>247 ?>
268248Template by <a href="http://b2evolution.net/" title="http://b2evolution.net/">b2evolution</a>
269 Template by <a href="http://b2evolution.net/" title="http://b2evolution.net/">b2evolution</a>249</p>
270250</div>
271 </p>251
272</div>252</div>
273</div>
274
275253
276<?php254<?php
277// ------------------------- HTML FOOTER INCLUDED HERE --------------------------255// --- --- --- --- --- --- --- --- --- --- ---
256// --- HTML FOOTER INCLUDED HERE ---
278template_include( '_html_footer.inc.php' );257template_include( '_html_footer.inc.php' );
279// Note: You can customize the default HTML footer by copying the
280// _html_footer.inc.php file into the current template folder.
281// ------------------------------- END OF FOOTER --------------------------------
282?>258?>
283\ No newline at end of file259\ No newline at end of file
284260
=== modified file 'blogs/templates/evocamp/_item_block.inc.php'
--- blogs/templates/evocamp/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evocamp/_item_block.inc.php 2010-01-03 09:20:31 +0000
@@ -83,18 +83,14 @@
83 ) );83 ) );
8484
85 }85 }
86 ?>86?>
87 </p>87</p>
88 <?php88<?php
89 // ---------------------- POST CONTENT INCLUDED HERE ----------------------89// --- --- --- --- --- --- --- --- --- --- ---
90 template_include( '_item_content.inc.php', $params );90// --- POST CONTENT INCLUDED HERE ---
91 // Note: You can customize the default item feedback by copying the generic91template_include( '_item_content.inc.php', $params );
92 // /templates/_item_content.inc.php file into the current template folder.
93 // -------------------------- END OF POST CONTENT -------------------------
94 ?>
9592
96 <?php93// List all tags attached to this post:
97 // List all tags attached to this post:
98 $Item->tags( array(94 $Item->tags( array(
99 'before' => '<div class="posttags">'.T_('Tags').': ',95 'before' => '<div class="posttags">'.T_('Tags').': ',
100 'after' => '</div>',96 'after' => '</div>',
10197
=== modified file 'blogs/templates/evocamp/index.main.php'
--- blogs/templates/evocamp/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evocamp/index.main.php 2010-01-03 09:20:31 +0000
@@ -12,47 +12,30 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '2.4.1' ) < 0 )
16{ // 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.
17 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>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the generic22
28// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
29// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
30?>
31
32
33<?php
34// ------------------------- BODY HEADER INCLUDED HERE --------------------------
35template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
36// Note: You can customize the default BODY header by copying the generic
37// /templates/_body_footer.inc.php file into the current template folder.
38// ------------------------------- END OF FOOTER --------------------------------
39?>26?>
4027
41<div id="page">28<div id="page">
4229
43 <div id="contentleft">30<div id="contentleft">
4431<?php
45 <?php32// --- --- --- --- --- --- --- --- --- --- ---
46 // ------------------------- SIDEBAR INCLUDED HERE --------------------------33// --- LEFT SIDEBAR INCLUDED HERE ---
47 template_include( '_sidebar_left.inc.php' );34template_include( '_sidebar_left.inc.php' );
48 // Note: You can customize the default BODY footer by copying the35?>
49 // _body_footer.inc.php file into the current template folder.36
50 // ----------------------------- END OF SIDEBAR -----------------------------37<div id="content">
51 ?>38<?php
52
53 <div id="content">
54
55 <?php
56 // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------39 // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
57 request_title( array(40 request_title( array(
58 'title_before'=> '<h2 class="sectionhead">',41 'title_before'=> '<h2 class="sectionhead">',
@@ -73,46 +56,30 @@
73 'block_end' => '</div>',56 'block_end' => '</div>',
74 ) );57 ) );
75 // --------------------------------- END OF MESSAGES ---------------------------------58 // --------------------------------- END OF MESSAGES ---------------------------------
76 ?>59
7760// --- --- --- --- --- --- --- --- --- --- ---
7861// MAIN CONTENT based on $disp INCLUDED HERE
79 <?php62template_include( '$disp$', array(
80 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------63 // @todo EdB: see if this makes it to the todo page AND document custom disp pages for this comment
81 template_include( '$disp$', array(64) );
82 ) );65?>
83 // Note: you can customize any of the sub templates included here by66</div>
84 // copying the matching php file into your template directory.
85 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
86 ?>
87
88
89 </div>
9067
91</div>68</div>
9269
93<?php70<?php
94// ------------------------- SIDEBAR INCLUDED HERE --------------------------71// --- --- --- --- --- --- --- --- --- --- ---
72// --- RIGHT SIDEBAR INCLUDED HERE ---
95template_include( '_sidebar_right.inc.php' );73template_include( '_sidebar_right.inc.php' );
96// Note: You can customize the default BODY footer by copying the
97// _body_footer.inc.php file into the current template folder.
98// ----------------------------- END OF SIDEBAR -----------------------------
99?>74?>
100
101</div>75</div>
10276
103<?php77<?php
104// ------------------------- BODY FOOTER INCLUDED HERE --------------------------78// --- --- --- --- --- --- --- --- --- --- ---
79// --- BODY FOOTER INCLUDED HERE ---
105template_include( '_body_footer.inc.php' );80template_include( '_body_footer.inc.php' );
106// Note: You can customize the default BODY footer by copying the81
107// _body_footer.inc.php file into the current template folder.82// --- --- --- --- --- --- --- --- --- --- ---
108// ------------------------------- END OF FOOTER --------------------------------83// --- HTML FOOTER INCLUDED HERE ---
109?>
110
111
112<?php
113// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
114template_include( '_html_footer.inc.php' );84template_include( '_html_footer.inc.php' );
115// Note: You can customize the default HTML footer by copying the85?>
116// _html_footer.inc.php file into the current template folder.
117// ------------------------------- END OF FOOTER --------------------------------
118?>
119\ No newline at end of file86\ No newline at end of file
12087
=== modified file 'blogs/templates/evocamp/page.main.php'
--- blogs/templates/evocamp/page.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evocamp/page.main.php 2010-01-03 09:20:31 +0000
@@ -12,47 +12,30 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '2.4.1' ) < 0 )
16{ // 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.
17 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>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the generic22
28// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
29// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
30?>
31
32
33<?php
34// ------------------------- BODY HEADER INCLUDED HERE --------------------------
35template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
36// Note: You can customize the default BODY header by copying the generic
37// /templates/_body_footer.inc.php file into the current template folder.
38// ------------------------------- END OF FOOTER --------------------------------
39?>26?>
4027
41<div id="page">28<div id="page">
4229
43 <div id="contentleft">30<div id="contentleft">
4431<?php
45 <?php32// --- --- --- --- --- --- --- --- --- --- ---
46 // ------------------------- SIDEBAR INCLUDED HERE --------------------------33// --- LEFT SIDEBAR INCLUDED HERE ---
47 template_include( '_sidebar_left.inc.php' );34template_include( '_sidebar_left.inc.php' );
48 // Note: You can customize the default BODY footer by copying the35?>
49 // _body_footer.inc.php file into the current template folder.36
50 // ----------------------------- END OF SIDEBAR -----------------------------37<div id="content">
51 ?>38<?php
52
53 <div id="content">
54
55 <?php
56 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------39 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
57 messages( array(40 messages( array(
58 'block_start' => '<div class="action_messages">',41 'block_start' => '<div class="action_messages">',
@@ -83,40 +66,33 @@
83 'after' => '',66 'after' => '',
84 'class' => 'floatright',67 'class' => 'floatright',
85 ) );68 ) );
86 ?>69 ?>
87 <?php $Item->title(); ?>70 <?php $Item->title(); ?>
88 </h2>71 </h2>
8972
90 <div class="post post<?php $Item->status_raw() ?>">73 <div class="post post<?php $Item->status_raw() ?>">
9174 <?php
92 <?php75 // --- --- --- --- --- --- --- --- --- --- ---
93 // ---------------------- POST CONTENT INCLUDED HERE ----------------------76 // --- POST CONTENT INCLUDED HERE ---
94 template_include( '_item_content.inc.php', array(77 template_include( '_item_content.inc.php', array(
95 'image_size' => 'fit-400x320',78 'image_size' => 'fit-400x320',
96 ) );79 ) );
97 // Note: You can customize the default item feedback by copying the generic80 ?>
98 // /templates/_item_feedback.inc.php file into the current template folder.81 </div>
99 // -------------------------- END OF POST CONTENT -------------------------82
100 ?>83 <?php
10184 // --- --- --- --- --- --- --- --- --- --- ---
102 </div>85 // --- ITEM FEEDBACK INCLUDED HERE ---
10386 template_include( '_item_feedback.inc.php', array(
104 <?php87 'before_section_title' => '<h3 class="feedback_section">',
105 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------88 'after_section_title' => '</h3>',
106 template_include( '_item_feedback.inc.php', array(89 'form_title_start' => '<h3 class="comment_form_title">',
107 'before_section_title' => '<h3 class="feedback_section">',90 'form_title_end' => '</h3>',
108 'after_section_title' => '</h3>',91 ) );
109 'form_title_start' => '<h3 class="comment_form_title">',92 ?>
110 'form_title_end' => '</h3>',93 </div>
111 ) );94
112 // Note: You can customize the default item feedback by copying the generic95 <?php
113 // /templates/_item_feedback.inc.php file into the current template folder.
114 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
115 ?>
116
117 </div>
118
119 <?php
120 locale_restore_previous(); // Restore previous locale (Blog locale)96 locale_restore_previous(); // Restore previous locale (Blog locale)
121 }97 }
122 ?>98 ?>
@@ -126,28 +102,18 @@
126</div>102</div>
127103
128<?php104<?php
129// ------------------------- SIDEBAR INCLUDED HERE --------------------------105// --- --- --- --- --- --- --- --- --- --- ---
106// --- RIGHT SIDEBAR INCLUDED HERE ---
130template_include( '_sidebar_right.inc.php' );107template_include( '_sidebar_right.inc.php' );
131// Note: You can customize the default BODY footer by copying the
132// _body_footer.inc.php file into the current template folder.
133// ----------------------------- END OF SIDEBAR -----------------------------
134?>108?>
135
136</div>109</div>
137110
138<?php111<?php
139// ------------------------- BODY FOOTER INCLUDED HERE --------------------------112// --- --- --- --- --- --- --- --- --- --- ---
113// --- BODY FOOTER INCLUDED HERE ---
140template_include( '_body_footer.inc.php' );114template_include( '_body_footer.inc.php' );
141// Note: You can customize the default BODY footer by copying the115
142// _body_footer.inc.php file into the current template folder.116// --- --- --- --- --- --- --- --- --- --- ---
143// ------------------------------- END OF FOOTER --------------------------------117// --- HTML FOOTER INCLUDED HERE ---
144?>
145
146
147<?php
148// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
149template_include( '_html_footer.inc.php' );118template_include( '_html_footer.inc.php' );
150// Note: You can customize the default HTML footer by copying the119?>
151// _html_footer.inc.php file into the current template folder.
152// ------------------------------- END OF FOOTER --------------------------------
153?>
154\ No newline at end of file120\ No newline at end of file
155121
=== modified file 'blogs/templates/evocamp/posts.main.php'
--- blogs/templates/evocamp/posts.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evocamp/posts.main.php 2010-01-03 09:20:31 +0000
@@ -12,63 +12,44 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '3.0' ) < 0 )
16{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
17 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the generic22
28// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
29// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
30?>
31
32
33<?php
34// ------------------------- BODY HEADER INCLUDED HERE --------------------------
35template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
36// Note: You can customize the default BODY header by copying the generic
37// /templates/_body_footer.inc.php file into the current template folder.
38// ------------------------------- END OF FOOTER --------------------------------
39?>26?>
4027
41<div id="page">28<div id="page">
4229
43 <div id="contentleft">30<div id="contentleft">
4431<?php
45 <?php32// do we have a featured/intro item to display?
46 // Go Grab the featured post:33if( $Item = & get_featured_Item() )
47 if( $Item = & get_featured_Item() )34{
48 { // We have a featured/intro post to display:35 // --- --- --- --- --- --- --- --- --- --- ---
49 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------36 // --- ITEM BLOCK INCLUDED HERE ---
50 template_include( '_item_block.inc.php', array(37 template_include( '_item_block.inc.php', array(
51 'feature_block' => true,38 'feature_block' => true,
52 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail39 'content_mode' => 'auto',
53 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode40 'intro_mode' => 'normal',
54 'item_class' => 'featurepost',41 'item_class' => 'featurepost',
55 'image_size' => 'fit-400x320',42 'image_size' => 'fit-400x320',
56 ) );43 ) );
57 // ----------------------------END ITEM BLOCK ----------------------------44}
58 }45
59 ?>46// --- --- --- --- --- --- --- --- --- --- ---
6047// --- LEFT SIDEBAR INCLUDED HERE ---
61 <?php48template_include( '_sidebar_left.inc.php' );
62 // ------------------------- SIDEBAR INCLUDED HERE --------------------------49?>
63 template_include( '_sidebar_left.inc.php' );50
64 // Note: You can customize the default BODY footer by copying the51<div id="content">
65 // _body_footer.inc.php file into the current template folder.52<?php
66 // ----------------------------- END OF SIDEBAR -----------------------------
67 ?>
68
69 <div id="content">
70
71 <?php
72 // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------53 // ------------------------- TITLE FOR THE CURRENT REQUEST -------------------------
73 request_title( array(54 request_title( array(
74 'title_before'=> '<h2 class="sectionhead">',55 'title_before'=> '<h2 class="sectionhead">',
@@ -96,21 +77,18 @@
96 // Display message if no post:77 // Display message if no post:
97 display_if_empty();78 display_if_empty();
9879
99 while( $Item = & mainlist_get_item() )80// do this loop for each item we need to display (aka 'the posts loop')
100 { // For each blog post:81while( $Item = & mainlist_get_item() )
101 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------82{
102 template_include( '_item_block.inc.php', array(83 // --- --- --- --- --- --- --- --- --- --- ---
103 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail84 // --- ITEM BLOCK INCLUDED HERE ---
104 'image_size' => 'fit-400x320',85 template_include( '_item_block.inc.php', array(
105 ) );86 'content_mode' => 'auto',
106 // Note: You can customize the default item feedback by copying the generic87 'image_size' => 'fit-400x320',
107 // /templates/_item_feedback.inc.php file into the current template folder.88 ) );
108 // ----------------------------END ITEM BLOCK ----------------------------89}
109 }
110 ?>
11190
112 <?php91// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
113 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
114 mainlist_page_links( array(92 mainlist_page_links( array(
115 'block_start' => '<div class="navigation">',93 'block_start' => '<div class="navigation">',
116 'block_end' => '</div>',94 'block_end' => '</div>',
@@ -125,28 +103,18 @@
125</div>103</div>
126104
127<?php105<?php
128// ------------------------- SIDEBAR INCLUDED HERE --------------------------106// --- --- --- --- --- --- --- --- --- --- ---
107// --- RIGHT SIDEBAR INCLUDED HERE ---
129template_include( '_sidebar_right.inc.php' );108template_include( '_sidebar_right.inc.php' );
130// Note: You can customize the default BODY footer by copying the
131// _body_footer.inc.php file into the current template folder.
132// ----------------------------- END OF SIDEBAR -----------------------------
133?>109?>
134
135</div>110</div>
136111
137<?php112<?php
138// ------------------------- BODY FOOTER INCLUDED HERE --------------------------113// --- --- --- --- --- --- --- --- --- --- ---
114// --- BODY FOOTER INCLUDED HERE ---
139template_include( '_body_footer.inc.php' );115template_include( '_body_footer.inc.php' );
140// Note: You can customize the default BODY footer by copying the116
141// _body_footer.inc.php file into the current template folder.117// --- --- --- --- --- --- --- --- --- --- ---
142// ------------------------------- END OF FOOTER --------------------------------118// --- HTML FOOTER INCLUDED HERE ---
143?>
144
145
146<?php
147// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
148template_include( '_html_footer.inc.php' );119template_include( '_html_footer.inc.php' );
149// Note: You can customize the default HTML footer by copying the120?>
150// _html_footer.inc.php file into the current template folder.
151// ------------------------------- END OF FOOTER --------------------------------
152?>
153\ No newline at end of file121\ No newline at end of file
154122
=== modified file 'blogs/templates/evocamp/single.main.php'
--- blogs/templates/evocamp/single.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evocamp/single.main.php 2010-01-03 09:20:31 +0000
@@ -12,47 +12,30 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '2.4.1' ) < 0 )
16{ // 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.
17 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>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the generic22
28// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
29// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
30?>
31
32
33<?php
34// ------------------------- BODY HEADER INCLUDED HERE --------------------------
35template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
36// Note: You can customize the default BODY header by copying the generic
37// /templates/_body_footer.inc.php file into the current template folder.
38// ------------------------------- END OF FOOTER --------------------------------
39?>26?>
4027
41<div id="page">28<div id="page">
4229
43 <div id="contentleft">30<div id="contentleft">
4431<?php
45 <?php32// --- --- --- --- --- --- --- --- --- --- ---
46 // ------------------------- SIDEBAR INCLUDED HERE --------------------------33// --- LEFT SIDEBAR INCLUDED HERE ---
47 template_include( '_sidebar_left.inc.php' );34template_include( '_sidebar_left.inc.php' );
48 // Note: You can customize the default BODY footer by copying the35?>
49 // _body_footer.inc.php file into the current template folder.36
50 // ----------------------------- END OF SIDEBAR -----------------------------37<div id="content">
51 ?>38<?php
52
53 <div id="content">
54
55 <?php
56 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------39 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
57 messages( array(40 messages( array(
58 'block_start' => '<div class="action_messages">',41 'block_start' => '<div class="action_messages">',
@@ -119,44 +102,35 @@
119 'before' => ' | ',102 'before' => ' | ',
120 'after' => '',103 'after' => '',
121 ) );104 ) );
122 ?>105 ?>
123 </p>106 </p>
124 <?php107 <?php
125 // ---------------------- POST CONTENT INCLUDED HERE ----------------------108 // --- --- --- --- --- --- --- --- --- --- ---
126 template_include( '_item_content.inc.php', array(109 // --- POST CONTENT INCLUDED HERE ---
127 'image_size' => 'fit-400x320',110 template_include( '_item_content.inc.php', array(
128 ) );111 'image_size' => 'fit-400x320',
129 // Note: You can customize the default item feedback by copying the generic112 ) );
130 // /templates/_item_feedback.inc.php file into the current template folder.
131 // -------------------------- END OF POST CONTENT -------------------------
132 ?>
133113
134 <?php114 // List all tags attached to this post:
135 // List all tags attached to this post:
136 $Item->tags( array(115 $Item->tags( array(
137 'before' => '<div class="posttags">'.T_('Tags').': ',116 'before' => '<div class="posttags">'.T_('Tags').': ',
138 'after' => '</div>',117 'after' => '</div>',
139 'separator' => ', ',118 'separator' => ', ',
140 ) );119 ) );
141 ?>120 ?>
142121 </div>
143 </div>122
144123 <?php
145 <?php124 // --- --- --- --- --- --- --- --- --- --- ---
146 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------125 // --- ITEM FEEDBACK INCLUDED HERE ---
147 template_include( '_item_feedback.inc.php', array(126 template_include( '_item_feedback.inc.php', array(
148 'before_section_title' => '<h3 class="feedback_section">',127 'before_section_title' => '<h3 class="feedback_section">',
149 'after_section_title' => '</h3>',128 'after_section_title' => '</h3>',
150 'form_title_start' => '<h3 class="comment_form_title">',129 'form_title_start' => '<h3 class="comment_form_title">',
151 'form_title_end' => '</h3>',130 'form_title_end' => '</h3>',
152 ) );131 ) );
153 // Note: You can customize the default item feedback by copying the generic132
154 // /templates/_item_feedback.inc.php file into the current template folder.133 locale_restore_previous(); // Restore previous locale (Blog locale)
155 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
156 ?>
157
158 <?php
159 locale_restore_previous(); // Restore previous locale (Blog locale)
160 }134 }
161 ?>135 ?>
162136
@@ -178,28 +152,18 @@
178</div>152</div>
179153
180<?php154<?php
181// ------------------------- SIDEBAR INCLUDED HERE --------------------------155// --- --- --- --- --- --- --- --- --- --- ---
156// --- RIGHT SIDEBAR INCLUDED HERE ---
182template_include( '_sidebar_right.inc.php' );157template_include( '_sidebar_right.inc.php' );
183// Note: You can customize the default BODY footer by copying the
184// _body_footer.inc.php file into the current template folder.
185// ----------------------------- END OF SIDEBAR -----------------------------
186?>158?>
187
188</div>159</div>
189160
190<?php161<?php
191// ------------------------- BODY FOOTER INCLUDED HERE --------------------------162// --- --- --- --- --- --- --- --- --- --- ---
163// --- BODY FOOTER INCLUDED HERE ---
192template_include( '_body_footer.inc.php' );164template_include( '_body_footer.inc.php' );
193// Note: You can customize the default BODY footer by copying the165
194// _body_footer.inc.php file into the current template folder.166// --- --- --- --- --- --- --- --- --- --- ---
195// ------------------------------- END OF FOOTER --------------------------------167// --- HTML FOOTER INCLUDED HERE ---
196?>
197
198
199<?php
200// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
201template_include( '_html_footer.inc.php' );168template_include( '_html_footer.inc.php' );
202// Note: You can customize the default HTML footer by copying the169?>
203// _html_footer.inc.php file into the current template folder.
204// ------------------------------- END OF FOOTER --------------------------------
205?>
206\ No newline at end of file170\ No newline at end of file
207171
=== modified file 'blogs/templates/evopress/_item_block.inc.php'
--- blogs/templates/evopress/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evopress/_item_block.inc.php 2010-01-03 09:20:31 +0000
@@ -53,18 +53,12 @@
53 'time_format' => 'F jS, Y',53 'time_format' => 'F jS, Y',
54 ) );54 ) );
55 }55 }
56 ?>56
5757// --- --- --- --- --- --- --- --- --- --- ---
58 <?php58// --- POST CONTENT INCLUDED HERE ---
59 // ---------------------- POST CONTENT INCLUDED HERE ----------------------59template_include( '_item_content.inc.php', $params );
60 template_include( '_item_content.inc.php', $params );60
61 // Note: You can customize the default item feedback by copying the generic61// List all tags attached to this post:
62 // /templates/_item_content.inc.php file into the current template folder.
63 // -------------------------- END OF POST CONTENT -------------------------
64 ?>
65
66 <?php
67 // List all tags attached to this post:
68 $Item->tags( array(62 $Item->tags( array(
69 'before' => '<div class="posttags">'.T_('Tags').': ',63 'before' => '<div class="posttags">'.T_('Tags').': ',
70 'after' => '</div>',64 'after' => '</div>',
7165
=== modified file 'blogs/templates/evopress/index.main.php'
--- blogs/templates/evopress/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evopress/index.main.php 2010-01-03 09:20:31 +0000
@@ -12,36 +12,21 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '2.4.1' ) < 0 )
16{ // 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.
17 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>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the generic22
28// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
29// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
30?>
31
32
33<?php
34// ------------------------- BODY HEADER INCLUDED HERE --------------------------
35template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
36// Note: You can customize the default BODY header by copying the generic
37// /templates/_body_footer.inc.php file into the current template folder.
38// ------------------------------- END OF FOOTER --------------------------------
39?>26?>
4027
41
42
43<div class="top_menu top_menu_narrow">28<div class="top_menu top_menu_narrow">
44 <ul>29<ul>
45 <?php30 <?php
46 // ------------------------- "Menu" CONTAINER EMBEDDED HERE --------------------------31 // ------------------------- "Menu" CONTAINER EMBEDDED HERE --------------------------
47 // Display container and contents:32 // Display container and contents:
@@ -57,7 +42,7 @@
57 ) );42 ) );
58 // ----------------------------- END OF "Menu" CONTAINER -----------------------------43 // ----------------------------- END OF "Menu" CONTAINER -----------------------------
59 ?>44 ?>
60 </ul>45</ul>
61</div>46</div>
6247
63<div id="content" class="narrowcolumn">48<div id="content" class="narrowcolumn">
@@ -82,42 +67,25 @@
82 'format' => 'htmlbody',67 'format' => 'htmlbody',
83 ) );68 ) );
84 // ------------------------------ END OF REQUEST TITLE -----------------------------69 // ------------------------------ END OF REQUEST TITLE -----------------------------
85 ?>70
8671// --- --- --- --- --- --- --- --- --- --- ---
87 <?php72// MAIN CONTENT based on $disp INCLUDED HERE
88 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------73template_include( '$disp$', array(
89 template_include( '$disp$', array(74 // @todo EdB: see if this makes it to the todo page AND document custom disp pages for this comment
90 ) );75) );
91 // Note: you can customize any of the sub templates included here by76?>
92 // copying the matching php file into your template directory.
93 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
94 ?>
95
96</div>77</div>
9778
98
99<?php79<?php
100// ------------------------- SIDEBAR INCLUDED HERE --------------------------80// --- --- --- --- --- --- --- --- --- --- ---
81// --- SIDEBAR INCLUDED HERE ---
101template_include( '_sidebar.inc.php' );82template_include( '_sidebar.inc.php' );
102// Note: You can customize the default BODY footer by copying the83
103// _body_footer.inc.php file into the current template folder.84// --- --- --- --- --- --- --- --- --- --- ---
104// ----------------------------- END OF SIDEBAR -----------------------------85// --- BODY FOOTER INCLUDED HERE ---
105?>
106
107
108<?php
109// ------------------------- BODY FOOTER INCLUDED HERE --------------------------
110template_include( '_body_footer.inc.php' );86template_include( '_body_footer.inc.php' );
111// Note: You can customize the default BODY footer by copying the87
112// _body_footer.inc.php file into the current template folder.88// --- --- --- --- --- --- --- --- --- --- ---
113// ------------------------------- END OF FOOTER --------------------------------89// --- HTML FOOTER INCLUDED HERE ---
114?>
115
116
117<?php
118// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
119template_include( '_html_footer.inc.php' );90template_include( '_html_footer.inc.php' );
120// Note: You can customize the default HTML footer by copying the91?>
121// _html_footer.inc.php file into the current template folder.
122// ------------------------------- END OF FOOTER --------------------------------
123?>
124\ No newline at end of file92\ No newline at end of file
12593
=== modified file 'blogs/templates/evopress/page.main.php'
--- blogs/templates/evopress/page.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evopress/page.main.php 2010-01-03 09:20:31 +0000
@@ -12,16 +12,10 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '2.4.1' ) < 0 )
16{ // 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.
17 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>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
24
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------19// -------------------------- HTML HEADER INCLUDED HERE --------------------------
26add_headline( <<<HEREDOC20add_headline( <<<HEREDOC
27<style type="text/css" media="screen">21<style type="text/css" media="screen">
@@ -29,25 +23,19 @@
29</style>23</style>
30HEREDOC24HEREDOC
31);25);
26
27// --- --- --- --- --- --- --- --- --- --- ---
28// --- HTML HEADER INCLUDED HERE ---
32template_include( '_html_header.inc.php' );29template_include( '_html_header.inc.php' );
33// Note: You can customize the default HTML header by copying the generic30
34// /templates/_html_header.inc.php file into the current template folder.31// --- --- --- --- --- --- --- --- --- --- ---
35// -------------------------------- END OF HEADER --------------------------------32// --- BODY HEADER INCLUDED HERE ---
36?>
37
38
39<?php
40// ------------------------- BODY HEADER INCLUDED HERE --------------------------
41template_include( '_body_header.inc.php' );33template_include( '_body_header.inc.php' );
42// Note: You can customize the default BODY header by copying the generic
43// /templates/_body_footer.inc.php file into the current template folder.
44// ------------------------------- END OF FOOTER --------------------------------
45?>34?>
4635
47
48<div class="top_menu">36<div class="top_menu">
49 <ul>37<ul>
50 <?php38<?php
51 // ------------------------- "Menu" CONTAINER EMBEDDED HERE --------------------------39 // ------------------------- "Menu" CONTAINER EMBEDDED HERE --------------------------
52 // Display container and contents:40 // Display container and contents:
53 template_container( NT_('Menu'), array(41 template_container( NT_('Menu'), array(
@@ -92,60 +80,40 @@
92 ?>80 ?>
9381
94 <div id="<?php $Item->anchor_id() ?>" class="post post<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">82 <div id="<?php $Item->anchor_id() ?>" class="post post<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
9583 <h2><?php $Item->title(); ?></h2>
96 <h2><?php $Item->title(); ?></h2>84 <?php
9785 // --- --- --- --- --- --- --- --- --- --- ---
98 <?php86 // --- POST CONTENT INCLUDED HERE ---
99 // ---------------------- POST CONTENT INCLUDED HERE ----------------------87 template_include( '_item_content.inc.php', array(
100 template_include( '_item_content.inc.php', array(88 'image_size' => 'fit-400x320',
101 'image_size' => 'fit-400x320',89 ) );
102 ) );90
103 // Note: You can customize the default item feedback by copying the generic91 $Item->edit_link( array( // Link to backoffice for editing
104 // /templates/_item_feedback.inc.php file into the current template folder.
105 // -------------------------- END OF POST CONTENT -------------------------
106 ?>
107
108 <?php
109 $Item->edit_link( array( // Link to backoffice for editing
110 'before' => '<p>',92 'before' => '<p>',
111 'after' => '</p>',93 'after' => '</p>',
112 ) );94 ) );
113 ?>95 ?>
114
115 </div>96 </div>
11697
117 <?php98 <?php
118 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------99 // --- --- --- --- --- --- --- --- --- --- ---
119 template_include( '_item_feedback.inc.php', array(100 // --- ITEM FEEDBACK INCLUDED HERE ---
120 'before_section_title' => '<h3>',101 template_include( '_item_feedback.inc.php', array(
121 'after_section_title' => '</h3>',102 'before_section_title' => '<h3>',
122 ) );103 'after_section_title' => '</h3>',
123 // Note: You can customize the default item feedback by copying the generic104 ) );
124 // /templates/_item_feedback.inc.php file into the current template folder.
125 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
126 ?>
127105
128 <?php
129 locale_restore_previous(); // Restore previous locale (Blog locale)106 locale_restore_previous(); // Restore previous locale (Blog locale)
130}107}
131?>108?>
132
133</div>109</div>
134110
135
136<?php111<?php
137// ------------------------- BODY FOOTER INCLUDED HERE --------------------------112// --- --- --- --- --- --- --- --- --- --- ---
113// --- BODY FOOTER INCLUDED HERE ---
138template_include( '_body_footer.inc.php' );114template_include( '_body_footer.inc.php' );
139// Note: You can customize the default BODY footer by copying the115
140// _body_footer.inc.php file into the current template folder.116// --- --- --- --- --- --- --- --- --- --- ---
141// ------------------------------- END OF FOOTER --------------------------------117// --- HTML FOOTER INCLUDED HERE ---
142?>
143
144
145<?php
146// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
147template_include( '_html_footer.inc.php' );118template_include( '_html_footer.inc.php' );
148// Note: You can customize the default HTML footer by copying the119?>
149// _html_footer.inc.php file into the current template folder.
150// ------------------------------- END OF FOOTER --------------------------------
151?>
152\ No newline at end of file120\ No newline at end of file
153121
=== modified file 'blogs/templates/evopress/posts.main.php'
--- blogs/templates/evopress/posts.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evopress/posts.main.php 2010-01-03 09:20:31 +0000
@@ -12,36 +12,22 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '3.0' ) < 0 )
16{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
17 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the generic22
28// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
29// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
30?>
31
32
33<?php
34// ------------------------- BODY HEADER INCLUDED HERE --------------------------
35template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
36// Note: You can customize the default BODY header by copying the generic
37// /templates/_body_footer.inc.php file into the current template folder.
38// ------------------------------- END OF FOOTER --------------------------------
39?>26?>
4027
41
42<div class="top_menu top_menu_narrow">28<div class="top_menu top_menu_narrow">
43 <ul>29<ul>
44 <?php30<?php
45 // ------------------------- "Menu" CONTAINER EMBEDDED HERE --------------------------31 // ------------------------- "Menu" CONTAINER EMBEDDED HERE --------------------------
46 // Display container and contents:32 // Display container and contents:
47 template_container( NT_('Menu'), array(33 template_container( NT_('Menu'), array(
@@ -82,41 +68,36 @@
82 'format' => 'htmlbody',68 'format' => 'htmlbody',
83 ) );69 ) );
84 // ------------------------------ END OF REQUEST TITLE -----------------------------70 // ------------------------------ END OF REQUEST TITLE -----------------------------
85?>
8671
87<?php72// do we have a featured/intro item to display?
88// Go Grab the featured post:
89if( $Item = & get_featured_Item() )73if( $Item = & get_featured_Item() )
90{ // We have a featured/intro post to display:74{
91 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------75 // --- --- --- --- --- --- --- --- --- --- ---
76 // --- ITEM BLOCK INCLUDED HERE ---
92 template_include( '_item_block.inc.php', array(77 template_include( '_item_block.inc.php', array(
93 'feature_block' => true,78 'feature_block' => true,
94 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail79 'content_mode' => 'auto',
95 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode80 'intro_mode' => 'normal',
96 'item_class' => 'featured_post',81 'item_class' => 'featured_post',
97 'image_size' => 'fit-400x320',82 'image_size' => 'fit-400x320',
98 ) );83 ) );
99 // ----------------------------END ITEM BLOCK ----------------------------
100}84}
101?>
10285
103<?php
104// Display message if no post:86// Display message if no post:
105display_if_empty();87display_if_empty();
10688
89// do this loop for each item we need to display (aka 'the posts loop')
107while( $Item = & mainlist_get_item() )90while( $Item = & mainlist_get_item() )
108{ // For each blog post:91{
109 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------92 // --- --- --- --- --- --- --- --- --- --- ---
93 // --- ITEM BLOCK INCLUDED HERE ---
110 template_include( '_item_block.inc.php', array(94 template_include( '_item_block.inc.php', array(
111 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail95 'content_mode' => 'auto',
112 'image_size' => 'fit-400x320',96 'image_size' => 'fit-400x320',
113 ) );97 ) );
114 // ----------------------------END ITEM BLOCK ----------------------------
115}98}
116?>
11799
118<?php100// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
119 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
120 mainlist_page_links( array(101 mainlist_page_links( array(
121 'block_start' => '<div class="navigation">',102 'block_start' => '<div class="navigation">',
122 'block_end' => '</div>',103 'block_end' => '</div>',
@@ -131,27 +112,15 @@
131112
132113
133<?php114<?php
134// ------------------------- SIDEBAR INCLUDED HERE --------------------------115// --- --- --- --- --- --- --- --- --- --- ---
116// --- SIDEBAR INCLUDED HERE ---
135template_include( '_sidebar.inc.php' );117template_include( '_sidebar.inc.php' );
136// Note: You can customize the default BODY footer by copying the118
137// _body_footer.inc.php file into the current template folder.119// --- --- --- --- --- --- --- --- --- --- ---
138// ----------------------------- END OF SIDEBAR -----------------------------120// --- BODY FOOTER INCLUDED HERE ---
139?>
140
141
142<?php
143// ------------------------- BODY FOOTER INCLUDED HERE --------------------------
144template_include( '_body_footer.inc.php' );121template_include( '_body_footer.inc.php' );
145// Note: You can customize the default BODY footer by copying the122
146// _body_footer.inc.php file into the current template folder.123// --- --- --- --- --- --- --- --- --- --- ---
147// ------------------------------- END OF FOOTER --------------------------------124// --- HTML FOOTER INCLUDED HERE ---
148?>
149
150
151<?php
152// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
153template_include( '_html_footer.inc.php' );125template_include( '_html_footer.inc.php' );
154// Note: You can customize the default HTML footer by copying the126?>
155// _html_footer.inc.php file into the current template folder.
156// ------------------------------- END OF FOOTER --------------------------------
157?>
158\ No newline at end of file127\ No newline at end of file
159128
=== modified file 'blogs/templates/evopress/single.main.php'
--- blogs/templates/evopress/single.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/evopress/single.main.php 2010-01-03 09:20:31 +0000
@@ -12,16 +12,10 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '2.4.1' ) < 0 )
16{ // 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.
17 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>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
24
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------19// -------------------------- HTML HEADER INCLUDED HERE --------------------------
26add_headline( <<<HEREDOC20add_headline( <<<HEREDOC
27<style type="text/css" media="screen">21<style type="text/css" media="screen">
@@ -29,25 +23,19 @@
29</style>23</style>
30HEREDOC24HEREDOC
31);25);
26
27// --- --- --- --- --- --- --- --- --- --- ---
28// --- HTML HEADER INCLUDED HERE ---
32template_include( '_html_header.inc.php' );29template_include( '_html_header.inc.php' );
33// Note: You can customize the default HTML header by copying the generic30
34// /templates/_html_header.inc.php file into the current template folder.31// --- --- --- --- --- --- --- --- --- --- ---
35// -------------------------------- END OF HEADER --------------------------------32// --- BODY HEADER INCLUDED HERE ---
36?>
37
38
39<?php
40// ------------------------- BODY HEADER INCLUDED HERE --------------------------
41template_include( '_body_header.inc.php' );33template_include( '_body_header.inc.php' );
42// Note: You can customize the default BODY header by copying the generic
43// /templates/_body_footer.inc.php file into the current template folder.
44// ------------------------------- END OF FOOTER --------------------------------
45?>34?>
4635
47
48<div class="top_menu">36<div class="top_menu">
49 <ul>37<ul>
50 <?php38<?php
51 // ------------------------- "Menu" CONTAINER EMBEDDED HERE --------------------------39 // ------------------------- "Menu" CONTAINER EMBEDDED HERE --------------------------
52 // Display container and contents:40 // Display container and contents:
53 template_container( NT_('Menu'), array(41 template_container( NT_('Menu'), array(
@@ -106,22 +94,17 @@
106 ?>94 ?>
10795
108 <div id="<?php $Item->anchor_id() ?>" class="post post<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">96 <div id="<?php $Item->anchor_id() ?>" class="post post<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
10997 <h2><?php $Item->title(); ?></h2>
110 <h2><?php $Item->title(); ?></h2>98 <?php
11199 // --- --- --- --- --- --- --- --- --- --- ---
112 <?php100 // --- POST CONTENT INCLUDED HERE ---
113 // ---------------------- POST CONTENT INCLUDED HERE ----------------------101 template_include( '_item_content.inc.php', array(
114 template_include( '_item_content.inc.php', array(102 'image_size' => 'fit-400x320',
115 'image_size' => 'fit-400x320',103 ) );
116 ) );104 ?>
117 // Note: You can customize the default item feedback by copying the generic105 <p class="postmetadata alt">
118 // /templates/_item_feedback.inc.php file into the current template folder.106 <small>
119 // -------------------------- END OF POST CONTENT -------------------------107 <?php
120 ?>
121
122 <p class="postmetadata alt">
123 <small>
124 <?php
125 $Item->author( array(108 $Item->author( array(
126 'link_text' => 'avatar',109 'link_text' => 'avatar',
127 'link_rel' => 'nofollow',110 'link_rel' => 'nofollow',
@@ -171,45 +154,30 @@
171 'before' => '',154 'before' => '',
172 'after' => '',155 'after' => '',
173 ) );156 ) );
174 ?>157 ?>
175 </small>158 </small>
176 </p>159 </p>
177
178 </div>160 </div>
179161
180162 <?php
181 <?php163 // --- --- --- --- --- --- --- --- --- --- ---
182 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------164 // --- ITEM FEEDBACK INCLUDED HERE ---
183 template_include( '_item_feedback.inc.php', array(165 template_include( '_item_feedback.inc.php', array(
184 'before_section_title' => '<h3>',166 'before_section_title' => '<h3>',
185 'after_section_title' => '</h3>',167 'after_section_title' => '</h3>',
186 ) );168 ) );
187 // Note: You can customize the default item feedback by copying the generic169
188 // /templates/_item_feedback.inc.php file into the current template folder.
189 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
190 ?>
191
192 <?php
193 locale_restore_previous(); // Restore previous locale (Blog locale)170 locale_restore_previous(); // Restore previous locale (Blog locale)
194}171}
195?>172?>
196
197</div>173</div>
198174
199
200<?php175<?php
201// ------------------------- BODY FOOTER INCLUDED HERE --------------------------176// --- --- --- --- --- --- --- --- --- --- ---
177// --- BODY FOOTER INCLUDED HERE ---
202template_include( '_body_footer.inc.php' );178template_include( '_body_footer.inc.php' );
203// Note: You can customize the default BODY footer by copying the179
204// _body_footer.inc.php file into the current template folder.180// --- --- --- --- --- --- --- --- --- --- ---
205// ------------------------------- END OF FOOTER --------------------------------181// --- HTML FOOTER INCLUDED HERE ---
206?>
207
208
209<?php
210// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
211template_include( '_html_footer.inc.php' );182template_include( '_html_footer.inc.php' );
212// Note: You can customize the default HTML footer by copying the183?>
213// _html_footer.inc.php file into the current template folder.
214// ------------------------------- END OF FOOTER --------------------------------
215?>
216\ No newline at end of file184\ No newline at end of file
217185
=== modified file 'blogs/templates/glossyblue/_item_block.inc.php'
--- blogs/templates/glossyblue/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/glossyblue/_item_block.inc.php 2010-01-03 09:20:31 +0000
@@ -75,18 +75,18 @@
75 'link_text_more' => '#',75 'link_text_more' => '#',
76 'link_title' => '#',76 'link_title' => '#',
77 'use_popup' => false,77 'use_popup' => false,
78 ) ); ?></span>78 ) );
79 </div>79?></span>
80 <?php80</div>
81 // ---------------------- POST CONTENT INCLUDED HERE ----------------------81
82 template_include( '_item_content.inc.php', $params );82<?php
83 // Note: You can customize the default item feedback by copying the generic83// --- --- --- --- --- --- --- --- --- --- ---
84 // /templates/_item_content.inc.php file into the current template folder.84// --- POST CONTENT INCLUDED HERE ---
85 // -------------------------- END OF POST CONTENT -------------------------85template_include( '_item_content.inc.php', $params );
86 ?>86?>
8787
88 <p class="postmetadata alt small">88<p class="postmetadata alt small">
89 <?php89<?php
90 // List all tags attached to this post:90 // List all tags attached to this post:
91 $Item->tags( array(91 $Item->tags( array(
92 'before' => T_('Tags').': ',92 'before' => T_('Tags').': ',
9393
=== modified file 'blogs/templates/glossyblue/index.main.php'
--- blogs/templates/glossyblue/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/glossyblue/index.main.php 2010-01-03 09:20:31 +0000
@@ -12,34 +12,20 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '2.4.1' ) < 0 )
16{ // 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.
17 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>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the generic22
28// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
29// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
30?>
31
32
33<?php
34// ------------------------- BODY HEADER INCLUDED HERE --------------------------
35template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
36// Note: You can customize the default BODY heder by copying the generic
37// /templates/_body_footer.inc.php file into the current template folder.
38// ------------------------------- END OF FOOTER --------------------------------
39?>26?>
4027
4128<div id="content">
42<div id="content" >
4329
44 <?php30 <?php
45 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------31 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
@@ -61,42 +47,25 @@
61 'format' => 'htmlbody',47 'format' => 'htmlbody',
62 ) );48 ) );
63 // ------------------------------ END OF REQUEST TITLE -----------------------------49 // ------------------------------ END OF REQUEST TITLE -----------------------------
64 ?>50
6551// --- --- --- --- --- --- --- --- --- --- ---
66 <?php52// MAIN CONTENT based on $disp INCLUDED HERE
67 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------53template_include( '$disp$', array(
68 template_include( '$disp$', array(54 // @todo EdB: see if this makes it to the todo page AND document custom disp pages for this comment
69 ) );55) );
70 // Note: you can customize any of the sub templates included here by56?>
71 // copying the matching php file into your template directory.
72 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
73 ?>
74
75</div>57</div>
7658
77
78<?php59<?php
79// ------------------------- SIDEBAR INCLUDED HERE --------------------------60// --- --- --- --- --- --- --- --- --- --- ---
61// --- SIDEBAR INCLUDED HERE ---
80template_include( '_sidebar.inc.php' );62template_include( '_sidebar.inc.php' );
81// Note: You can customize the default BODY footer by copying the63
82// _body_footer.inc.php file into the current template folder.64// --- --- --- --- --- --- --- --- --- --- ---
83// ----------------------------- END OF SIDEBAR -----------------------------65// --- BODY FOOTER INCLUDED HERE ---
84?>
85
86
87<?php
88// ------------------------- BODY FOOTER INCLUDED HERE --------------------------
89template_include( '_body_footer.inc.php' );66template_include( '_body_footer.inc.php' );
90// Note: You can customize the default BODY footer by copying the67
91// _body_footer.inc.php file into the current template folder.68// --- --- --- --- --- --- --- --- --- --- ---
92// ------------------------------- END OF FOOTER --------------------------------69// --- HTML FOOTER INCLUDED HERE ---
93?>
94
95
96<?php
97// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
98template_include( '_html_footer.inc.php' );70template_include( '_html_footer.inc.php' );
99// Note: You can customize the default HTML footer by copying the71?>
100// _html_footer.inc.php file into the current template folder.
101// ------------------------------- END OF FOOTER --------------------------------
102?>
103\ No newline at end of file72\ No newline at end of file
10473
=== modified file 'blogs/templates/glossyblue/page.main.php'
--- blogs/templates/glossyblue/page.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/glossyblue/page.main.php 2010-01-03 09:20:31 +0000
@@ -12,35 +12,20 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '2.4.1' ) < 0 )
16{ // 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.
17 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>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
20// --- HTML HEADER INCLUDED HERE ---
25template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
26// Note: You can customize the default HTML header by copying the generic22
27// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
28// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
29?>
30
31
32<?php
33// ------------------------- BODY HEADER INCLUDED HERE --------------------------
34template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
35// Note: You can customize the default BODY heder by copying the generic
36// /templates/_body_footer.inc.php file into the current template folder.
37// ------------------------------- END OF FOOTER --------------------------------
38?>26?>
3927
4028<div id="content">
41<div id="content" >
42
43
44<?php29<?php
45 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------30 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
46 messages( array(31 messages( array(
@@ -65,21 +50,15 @@
65 ?>50 ?>
6651
67 <div class="post post<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">52 <div class="post post<?php $Item->status_raw() ?>" lang="<?php $Item->lang() ?>">
6853 <h2><?php $Item->title(); ?></h2>
69 <h2><?php $Item->title(); ?></h2>54 <?php
7055 // --- --- --- --- --- --- --- --- --- --- ---
71 <?php56 // --- POST CONTENT INCLUDED HERE ---
72 // ---------------------- POST CONTENT INCLUDED HERE ----------------------57 template_include( '_item_content.inc.php', array(
73 template_include( '_item_content.inc.php', array(58 'image_size' => 'fit-400x320',
74 'image_size' => 'fit-400x320',59 ) );
75 ) );60
76 // Note: You can customize the default item feedback by copying the generic61 $Item->edit_link( array( // Link to backoffice for editing
77 // /templates/_item_feedback.inc.php file into the current template folder.
78 // -------------------------- END OF POST CONTENT -------------------------
79 ?>
80
81 <?php
82 $Item->edit_link( array( // Link to backoffice for editing
83 'before' => '<p>',62 'before' => '<p>',
84 'after' => '</p>',63 'after' => '</p>',
85 ) );64 ) );
@@ -96,26 +75,15 @@
9675
97</div>76</div>
98<?php77<?php
99// ------------------------- SIDEBAR INCLUDED HERE --------------------------78// --- --- --- --- --- --- --- --- --- --- ---
79// --- SIDEBAR INCLUDED HERE ---
100template_include( '_sidebar.inc.php' );80template_include( '_sidebar.inc.php' );
101// Note: You can customize the default BODY footer by copying the
102// _body_footer.inc.php file into the current template folder.
103// ----------------------------- END OF SIDEBAR -----------------------------
104?>
10581
106<?php82// --- --- --- --- --- --- --- --- --- --- ---
107// ------------------------- BODY FOOTER INCLUDED HERE --------------------------83// --- BODY FOOTER INCLUDED HERE ---
108template_include( '_body_footer.inc.php' );84template_include( '_body_footer.inc.php' );
109// Note: You can customize the default BODY footer by copying the85
110// _body_footer.inc.php file into the current template folder.86// --- --- --- --- --- --- --- --- --- --- ---
111// ------------------------------- END OF FOOTER --------------------------------87// --- HTML FOOTER INCLUDED HERE ---
112?>
113
114
115<?php
116// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
117template_include( '_html_footer.inc.php' );88template_include( '_html_footer.inc.php' );
118// Note: You can customize the default HTML footer by copying the89?>
119// _html_footer.inc.php file into the current template folder.
120// ------------------------------- END OF FOOTER --------------------------------
121?>
122\ No newline at end of file90\ No newline at end of file
12391
=== modified file 'blogs/templates/glossyblue/posts.main.php'
--- blogs/templates/glossyblue/posts.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/glossyblue/posts.main.php 2010-01-03 09:20:31 +0000
@@ -12,35 +12,20 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '3.0' ) < 0 )
16{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
17 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the generic22
28// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
29// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
30?>
31
32
33<?php
34// ------------------------- BODY HEADER INCLUDED HERE --------------------------
35template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
36// Note: You can customize the default BODY heder by copying the generic
37// /templates/_body_footer.inc.php file into the current template folder.
38// ------------------------------- END OF FOOTER --------------------------------
39?>26?>
4027
4128<div id="content">
42<div id="content" >
43
44<?php29<?php
45 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------30 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
46 messages( array(31 messages( array(
@@ -61,41 +46,36 @@
61 'format' => 'htmlbody',46 'format' => 'htmlbody',
62 ) );47 ) );
63 // ------------------------------ END OF REQUEST TITLE -----------------------------48 // ------------------------------ END OF REQUEST TITLE -----------------------------
64?>
6549
66<?php50// do we have a featured/intro item to display?
67// Go Grab the featured post:
68if( $Item = & get_featured_Item() )51if( $Item = & get_featured_Item() )
69{ // We have a featured/intro post to display:52{
70 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------53 // --- --- --- --- --- --- --- --- --- --- ---
54 // --- ITEM BLOCK INCLUDED HERE ---
71 template_include( '_item_block.inc.php', array(55 template_include( '_item_block.inc.php', array(
72 'feature_block' => true,56 'feature_block' => true,
73 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail57 'content_mode' => 'auto',
74 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode58 'intro_mode' => 'normal',
75 'item_class' => 'featured_post',59 'item_class' => 'featured_post',
76 'image_size' => 'fit-400x320',60 'image_size' => 'fit-400x320',
77 ) );61 ) );
78 // ----------------------------END ITEM BLOCK ----------------------------
79}62}
80?>
8163
82<?php
83// Display message if no post:64// Display message if no post:
84display_if_empty();65display_if_empty();
8566
67// do this loop for each item we need to display (aka 'the posts loop')
86while( $Item = & mainlist_get_item() )68while( $Item = & mainlist_get_item() )
87{ // For each blog post:69{
88 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------70 // --- --- --- --- --- --- --- --- --- --- ---
71 // --- ITEM BLOCK INCLUDED HERE ---
89 template_include( '_item_block.inc.php', array(72 template_include( '_item_block.inc.php', array(
90 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail73 'content_mode' => 'auto',
91 'image_size' => 'fit-400x320',74 'image_size' => 'fit-400x320',
92 ) );75 ) );
93 // ----------------------------END ITEM BLOCK ----------------------------
94}76}
95?>
9677
97<?php78// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
98 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
99 mainlist_page_links( array(79 mainlist_page_links( array(
100 'block_start' => '<div class="navigation">',80 'block_start' => '<div class="navigation">',
101 'block_end' => '</div>',81 'block_end' => '</div>',
@@ -110,27 +90,15 @@
11090
11191
112<?php92<?php
113// ------------------------- SIDEBAR INCLUDED HERE --------------------------93// --- --- --- --- --- --- --- --- --- --- ---
94// --- SIDEBAR INCLUDED HERE ---
114template_include( '_sidebar.inc.php' );95template_include( '_sidebar.inc.php' );
115// Note: You can customize the default BODY footer by copying the96
116// _body_footer.inc.php file into the current template folder.97// --- --- --- --- --- --- --- --- --- --- ---
117// ----------------------------- END OF SIDEBAR -----------------------------98// --- BODY FOOTER INCLUDED HERE ---
118?>
119
120
121<?php
122// ------------------------- BODY FOOTER INCLUDED HERE --------------------------
123template_include( '_body_footer.inc.php' );99template_include( '_body_footer.inc.php' );
124// Note: You can customize the default BODY footer by copying the100
125// _body_footer.inc.php file into the current template folder.101// --- --- --- --- --- --- --- --- --- --- ---
126// ------------------------------- END OF FOOTER --------------------------------102// --- HTML FOOTER INCLUDED HERE ---
127?>
128
129
130<?php
131// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
132template_include( '_html_footer.inc.php' );103template_include( '_html_footer.inc.php' );
133// Note: You can customize the default HTML footer by copying the104?>
134// _html_footer.inc.php file into the current template folder.
135// ------------------------------- END OF FOOTER --------------------------------
136?>
137\ No newline at end of file105\ No newline at end of file
138106
=== modified file 'blogs/templates/glossyblue/single.main.php'
--- blogs/templates/glossyblue/single.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/glossyblue/single.main.php 2010-01-03 09:20:31 +0000
@@ -12,35 +12,20 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '2.4.1' ) < 0 )
16{ // 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.
17 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>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
20// --- HTML HEADER INCLUDED HERE ---
25template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
26// Note: You can customize the default HTML header by copying the generic22
27// /templates/_html_header.inc.php file into the current template folder.23// --- --- --- --- --- --- --- --- --- --- ---
28// -------------------------------- END OF HEADER --------------------------------24// --- BODY HEADER INCLUDED HERE ---
29?>
30
31
32<?php
33// ------------------------- BODY HEADER INCLUDED HERE --------------------------
34template_include( '_body_header.inc.php' );25template_include( '_body_header.inc.php' );
35// Note: You can customize the default BODY heder by copying the generic
36// /templates/_body_footer.inc.php file into the current template folder.
37// ------------------------------- END OF FOOTER --------------------------------
38?>26?>
3927
4028<div id="content">
41<div id="content" >
42
43
44<?php29<?php
45 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------30 // ------------------------- MESSAGES GENERATED FROM ACTIONS -------------------------
46 messages( array(31 messages( array(
@@ -114,76 +99,54 @@
114 ) ); ?></span>99 ) ); ?></span>
115 </div>100 </div>
116101
117 <?php102 <?php
118 // ---------------------- POST CONTENT INCLUDED HERE ----------------------103 // --- --- --- --- --- --- --- --- --- --- ---
119 template_include( '_item_content.inc.php', array(104 // --- POST CONTENT INCLUDED HERE ---
120 'image_size' => 'fit-400x320',105 template_include( '_item_content.inc.php', array(
121 ) );106 'image_size' => 'fit-400x320',
122 // Note: You can customize the default item feedback by copying the generic107 ) );
123 // /templates/_item_feedback.inc.php file into the current template folder.108 ?>
124 // -------------------------- END OF POST CONTENT -------------------------109 <p class="postmetadata alt small">
125 ?>110 <?php
126
127 <p class="postmetadata alt small">
128 <?php
129 // List all tags attached to this post:111 // List all tags attached to this post:
130 $Item->tags( array(112 $Item->tags( array(
131 'before' => ' '.T_('Tags').': ',113 'before' => ' '.T_('Tags').': ',
132 'after' => ' ',114 'after' => ' ',
133 'separator' => ', ',115 'separator' => ', ',
134 ) );116 ) );
135 ?>117
136 <!-- You can follow any responses to this entry through the RSS feed. -->
137 <?php
138 $Item->edit_link( array( // Link to backoffice for editing118 $Item->edit_link( array( // Link to backoffice for editing
139 'before' => '',119 'before' => '',
140 'after' => '',120 'after' => '',
141121
142 ) );122 ) );
143 ?>123 ?>
144 </p>124 </p>
145
146 </div>125 </div>
147126
148127 <?php
149 <?php128 // --- --- --- --- --- --- --- --- --- --- ---
150 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------129 // --- ITEM FEEDBACK INCLUDED HERE ---
151 template_include( '_item_feedback.inc.php', array(130 template_include( '_item_feedback.inc.php', array(
152 'before_section_title' => '<h3>',131 'before_section_title' => '<h3>',
153 'after_section_title' => '</h3>',132 'after_section_title' => '</h3>',
154 ) );133 ) );
155 // Note: You can customize the default item feedback by copying the generic134
156 // /templates/_item_feedback.inc.php file into the current template folder.
157 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
158 ?>
159
160 <?php
161 locale_restore_previous(); // Restore previous locale (Blog locale)135 locale_restore_previous(); // Restore previous locale (Blog locale)
162}136}
163?>137?>
164138
165</div>139</div>
166<?php140<?php
167// ------------------------- SIDEBAR INCLUDED HERE --------------------------141// --- --- --- --- --- --- --- --- --- --- ---
142// --- SIDEBAR INCLUDED HERE ---
168template_include( '_sidebar.inc.php' );143template_include( '_sidebar.inc.php' );
169// Note: You can customize the default BODY footer by copying the
170// _body_footer.inc.php file into the current template folder.
171// ----------------------------- END OF SIDEBAR -----------------------------
172?>
173144
174<?php145// --- --- --- --- --- --- --- --- --- --- ---
175// ------------------------- BODY FOOTER INCLUDED HERE --------------------------146// --- BODY FOOTER INCLUDED HERE ---
176template_include( '_body_footer.inc.php' );147template_include( '_body_footer.inc.php' );
177// Note: You can customize the default BODY footer by copying the148
178// _body_footer.inc.php file into the current template folder.149// --- --- --- --- --- --- --- --- --- --- ---
179// ------------------------------- END OF FOOTER --------------------------------150// --- HTML FOOTER INCLUDED HERE ---
180?>
181
182
183<?php
184// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
185template_include( '_html_footer.inc.php' );151template_include( '_html_footer.inc.php' );
186// Note: You can customize the default HTML footer by copying the152?>
187// _html_footer.inc.php file into the current template folder.
188// ------------------------------- END OF FOOTER --------------------------------
189?>
190\ No newline at end of file153\ No newline at end of file
191154
=== modified file 'blogs/templates/miami_blue/_item_block.inc.php'
--- blogs/templates/miami_blue/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/miami_blue/_item_block.inc.php 2010-01-03 09:20:31 +0000
@@ -62,19 +62,15 @@
62 'before_main' => '<strong>',62 'before_main' => '<strong>',
63 'after_main' => '</strong>',63 'after_main' => '</strong>',
64 ) );64 ) );
65 ?>65?>
66 </div>66</div>
6767
68 <?php68<?php
69 // ---------------------- POST CONTENT INCLUDED HERE ----------------------69// --- --- --- --- --- --- --- --- --- --- ---
70 template_include( '_item_content.inc.php', $params );70// --- POST CONTENT INCLUDED HERE ---
71 // Note: You can customize the default item feedback by copying the generic71template_include( '_item_content.inc.php', $params );
72 // /templates/_item_content.inc.php file into the current template folder.72
73 // -------------------------- END OF POST CONTENT -------------------------73// List all tags attached to this post:
74 ?>
75
76 <?php
77 // List all tags attached to this post:
78 $Item->tags( array(74 $Item->tags( array(
79 'before' => '<div class="">'.T_('Tags').': ',75 'before' => '<div class="">'.T_('Tags').': ',
80 'after' => '</div>',76 'after' => '</div>',
@@ -104,25 +100,19 @@
104 $Item->permanent_link( array(100 $Item->permanent_link( array(
105 'text' => '<img src="img/page.gif" alt="Permalink" width="9" height="12" class="middle" />',101 'text' => '<img src="img/page.gif" alt="Permalink" width="9" height="12" class="middle" />',
106 ) );102 ) );
107 ?>103?>
108 </div>
109 <img src="../../rsc/img/blank.gif" width="1" height="1" alt="" />
110 <?php
111 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------
112 template_include( '_item_feedback.inc.php', array(
113 'before_section_title' => '<h4>',
114 'after_section_title' => '</h4>',
115 ) );
116 // Note: You can customize the default item feedback by copying the generic
117 // /templates/_item_feedback.inc.php file into the current template folder.
118 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
119 ?>
120
121 <?php
122 locale_restore_previous(); // Restore previous locale (Blog locale)
123 ?>
124</div>104</div>
125105
106<img src="../../rsc/img/blank.gif" width="1" height="1" alt="" />
126<?php107<?php
108// --- --- --- --- --- --- --- --- --- --- ---
109// --- ITEM FEEDBACK INCLUDED HERE ---
110template_include( '_item_feedback.inc.php', array(
111 'before_section_title' => '<h4>',
112 'after_section_title' => '</h4>',
113) );
127114
115// restore previous (Blog) locale
116locale_restore_previous();
128?>117?>
118</div>
129119
=== modified file 'blogs/templates/miami_blue/index.main.php'
--- blogs/templates/miami_blue/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/miami_blue/index.main.php 2010-01-03 09:20:31 +0000
@@ -11,21 +11,13 @@
11 */11 */
12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1313
14if( version_compare( $app_version, '3.0' ) < 0 )
15{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
16 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
17}
18
19// This is the main template; it may be used to display very different things.14// This is the main template; it may be used to display very different things.
20// Do inits depending on current $disp:15// Do inits depending on current $disp:
21template_init( $disp );16template_init( $disp );
2217
2318// --- --- --- --- --- --- --- --- --- --- ---
24// -------------------------- HTML HEADER INCLUDED HERE --------------------------19// --- HTML HEADER INCLUDED HERE ---
25template_include( '_html_header.inc.php' );20template_include( '_html_header.inc.php' );
26// Note: You can customize the default HTML header by copying the
27// _html_header.inc.php file into the current template folder.
28// -------------------------------- END OF HEADER --------------------------------
29?>21?>
3022
31<div id="wrapper">23<div id="wrapper">
@@ -124,71 +116,56 @@
124 'format' => 'htmlbody',116 'format' => 'htmlbody',
125 ) );117 ) );
126 // ------------------------------ END OF REQUEST TITLE -----------------------------118 // ------------------------------ END OF REQUEST TITLE -----------------------------
127 ?>119
128120// do we have a featured/intro item to display?
129 <?php121if( $Item = & get_featured_Item() )
130 // Go Grab the featured post:122{
131 if( $Item = & get_featured_Item() )123 // --- --- --- --- --- --- --- --- --- --- ---
132 { // We have a featured/intro post to display:124 // --- ITEM BLOCK INCLUDED HERE ---
133 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------125 template_include( '_item_block.inc.php', array(
134 template_include( '_item_block.inc.php', array(126 'feature_block' => true,
135 'feature_block' => true,127 'content_mode' => 'auto',
136 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail128 'intro_mode' => 'normal',
137 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode129 'item_class' => 'featured_post',
138 'item_class' => 'featured_post',130 'image_size' => 'fit-400x320',
139 'image_size' => 'fit-400x320',131 ) );
140 ) );132}
141 // ----------------------------END ITEM BLOCK ----------------------------133
142 }134// ------------------------------------ START OF POSTS ----------------------------------------
143 ?>
144
145 <?php
146 // ------------------------------------ START OF POSTS ----------------------------------------
147 // Display message if no post:135 // Display message if no post:
148 display_if_empty();136 display_if_empty();
149137
150 while( $Item = & mainlist_get_item() )138// do this loop for each item we need to display (aka 'the posts loop')
151 { // For each blog post:139while( $Item = & mainlist_get_item() )
152 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------140{
153 template_include( '_item_block.inc.php', array(141 // --- --- --- --- --- --- --- --- --- --- ---
154 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail142 // --- ITEM BLOCK INCLUDED HERE ---
155 'image_size' => 'fit-400x320',143 template_include( '_item_block.inc.php', array(
156 ) );144 'content_mode' => 'auto',
157 // ----------------------------END ITEM BLOCK ----------------------------145 'image_size' => 'fit-400x320',
158 } // ---------------------------------- END OF POSTS ------------------------------------146 ) );
159147}
160 ?>148
161149// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
162 <?php
163 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
164 mainlist_page_links( array(150 mainlist_page_links( array(
165 'block_start' => '<p class="center">'.T_('Pages:').' <strong>',151 'block_start' => '<p class="center">'.T_('Pages:').' <strong>',
166 'block_end' => '</strong></p>',152 'block_end' => '</strong></p>',
167 ) );153 ) );
168 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------154 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
169 ?>155
170156// --- --- --- --- --- --- --- --- --- --- ---
171157// MAIN CONTENT INCLUDED HERE
172 <?php158template_include( '$disp$', array(
173 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------159 // we already handled these cases above
174 template_include( '$disp$', array(160 'disp_posts' => '',
175 'disp_posts' => '', // We already handled this case above161 'disp_single' => '',
176 'disp_single' => '', // We already handled this case above162 'disp_page' => '',
177 'disp_page' => '', // We already handled this case above163) );
178 ) );164?>
179 // Note: you can customize any of the sub templates included here by
180 // copying the matching php file into your template directory.
181 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
182 ?>
183
184
185</div>165</div>
186<!-- =================================== START OF SIDEBAR =================================== -->
187166
188<div class="bSideBar">167<div class="bSideBar">
189168<?php
190
191 <?php
192 // Display container contents:169 // Display container contents:
193 template_container( NT_('Sidebar'), array(170 template_container( NT_('Sidebar'), array(
194 // The following (optional) params will be used as defaults for widgets included in this container:171 // The following (optional) params will be used as defaults for widgets included in this container:
@@ -235,18 +212,17 @@
235 'text' => T_('Contact'),212 'text' => T_('Contact'),
236 'title' => T_('Send a message to the owner of this blog...'),213 'title' => T_('Send a message to the owner of this blog...'),
237 ) );214 ) );
238 ?>215?>
239216<a href="http://www.sunnyislesmiamirealestate.com/b2evolution-skins/" target="_blank">template</a>
240 <a href="http://www.sunnyislesmiamirealestate.com/b2evolution-skins/" target="_blank">template</a>217</p>
241218</div>
242 </p>219
243</div>220</div>
244</div>221
245</div>222</div>
223
246<?php224<?php
247// ------------------------- HTML FOOTER INCLUDED HERE --------------------------225// --- --- --- --- --- --- --- --- --- --- ---
226// --- HTML FOOTER INCLUDED HERE ---
248template_include( '_html_footer.inc.php' );227template_include( '_html_footer.inc.php' );
249// Note: You can customize the default HTML footer by copying the
250// _html_footer.inc.php file into the current template folder.
251// ------------------------------- END OF FOOTER --------------------------------
252?>228?>
253\ No newline at end of file229\ No newline at end of file
254230
=== modified file 'blogs/templates/natural_pink/_item_block.inc.php'
--- blogs/templates/natural_pink/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/natural_pink/_item_block.inc.php 2010-01-03 09:20:31 +0000
@@ -65,21 +65,18 @@
65 'after' => ' ',65 'after' => ' ',
66 'separator' => ', ',66 'separator' => ', ',
67 ) );67 ) );
68 ?>68?>
69 </div>69</div>
7070
71 <h3 class="bTitle"><?php $Item->title(); ?></h3>71<h3 class="bTitle"><?php $Item->title(); ?></h3>
7272<?php
73 <?php73// --- --- --- --- --- --- --- --- --- --- ---
74 // ---------------------- POST CONTENT INCLUDED HERE ----------------------74// --- POST CONTENT INCLUDED HERE ---
75 template_include( '_item_content.inc.php', $params );75template_include( '_item_content.inc.php', $params );
76 // Note: You can customize the default item feedback by copying the generic76?>
77 // /templates/_item_content.inc.php file into the current template folder.77
78 // -------------------------- END OF POST CONTENT -------------------------78<div class="bSmallPrint">
79 ?>79<?php
80
81 <div class="bSmallPrint">
82 <?php
83 $Item->permanent_link();80 $Item->permanent_link();
8481
85 // Link to comments, trackbacks, etc.:82 // Link to comments, trackbacks, etc.:
@@ -110,25 +107,18 @@
110 'before' => ' &bull; ',107 'before' => ' &bull; ',
111 'after' => '',108 'after' => '',
112 ) );109 ) );
113 ?>110?>
114 </div>
115
116 <?php
117 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------
118 template_include( '_item_feedback.inc.php', array(
119 'before_section_title' => '<h4>',
120 'after_section_title' => '</h4>',
121 ) );
122 // Note: You can customize the default item feedback by copying the generic
123 // /templates/_item_feedback.inc.php file into the current template folder.
124 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
125 ?>
126
127 <?php
128 locale_restore_previous(); // Restore previous locale (Blog locale)
129 ?>
130</div>111</div>
131112
132<?php113<?php
114// --- --- --- --- --- --- --- --- --- --- ---
115// --- ITEM FEEDBACK INCLUDED HERE ---
116template_include( '_item_feedback.inc.php', array(
117 'before_section_title' => '<h4>',
118 'after_section_title' => '</h4>',
119) );
133120
121// restore previous (Blog) locale
122locale_restore_previous();
134?>123?>
124</div>
135125
=== modified file 'blogs/templates/natural_pink/index.main.php'
--- blogs/templates/natural_pink/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/natural_pink/index.main.php 2010-01-03 09:20:31 +0000
@@ -11,21 +11,13 @@
11 */11 */
12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1313
14if( version_compare( $app_version, '3.0' ) < 0 )
15{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
16 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
17}
18
19// This is the main template; it may be used to display very different things.14// This is the main template; it may be used to display very different things.
20// Do inits depending on current $disp:15// Do inits depending on current $disp:
21template_init( $disp );16template_init( $disp );
2217
2318// --- --- --- --- --- --- --- --- --- --- ---
24// -------------------------- HTML HEADER INCLUDED HERE --------------------------19// --- HTML HEADER INCLUDED HERE ---
25template_include( '_html_header.inc.php' );20template_include( '_html_header.inc.php' );
26// Note: You can customize the default HTML header by copying the
27// _html_header.inc.php file into the current template folder.
28// -------------------------------- END OF HEADER --------------------------------
29?>21?>
3022
31<div class="wrapper">23<div class="wrapper">
@@ -115,27 +107,22 @@
115 'format' => 'htmlbody',107 'format' => 'htmlbody',
116 ) );108 ) );
117 // ------------------------------ END OF REQUEST TITLE -----------------------------109 // ------------------------------ END OF REQUEST TITLE -----------------------------
118?>110
119111// do we have a featured/intro item to display?
120<!-- =================================== START OF MAIN AREA =================================== -->
121
122<?php
123// Go Grab the featured post:
124if( $Item = & get_featured_Item() )112if( $Item = & get_featured_Item() )
125{ // We have a featured/intro post to display:113{
126 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------114 // --- --- --- --- --- --- --- --- --- --- ---
115 // --- ITEM BLOCK INCLUDED HERE ---
127 template_include( '_item_block.inc.php', array(116 template_include( '_item_block.inc.php', array(
128 'feature_block' => true,117 'feature_block' => true,
129 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail118 'content_mode' => 'auto',
130 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode119 'intro_mode' => 'normal',
131 'item_class' => 'featured_post',120 'item_class' => 'featured_post',
132 'image_size' => 'fit-400x320',121 'image_size' => 'fit-400x320',
133 ) );122 ) );
134 // ----------------------------END ITEM BLOCK ----------------------------
135}123}
136?>
137124
138<?php // ------------------------------------ START OF POSTS ----------------------------------------125// ------------------------------------ START OF POSTS ----------------------------------------
139 // Display message if no post:126 // Display message if no post:
140 display_if_empty();127 display_if_empty();
141128
@@ -149,15 +136,15 @@
149 'date_format' => '#',136 'date_format' => '#',
150 ) );137 ) );
151138
152 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------139 // --- --- --- --- --- --- --- --- --- --- ---
153 template_include( '_item_block.inc.php', array(140 // --- ITEM BLOCK INCLUDED HERE ---
154 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail141 template_include( '_item_block.inc.php', array(
155 'image_size' => 'fit-400x320',142 'content_mode' => 'auto',
156 ) );143 'image_size' => 'fit-400x320',
157 // ----------------------------END ITEM BLOCK ----------------------------144 ) );
158 ?>145 ?>
159146
160 <div class="separator" ><img src="rsc/img/separator.gif" width="265" height="14" alt="" /></div>147 <div class="separator" ><img src="rsc/img/separator.gif" width="265" height="14" alt="" /></div>
161 <?php } // ---------------------------------- END OF POSTS ------------------------------------ ?>148 <?php } // ---------------------------------- END OF POSTS ------------------------------------ ?>
162149
163 <?php150 <?php
@@ -170,27 +157,20 @@
170 'next_text' => T_('Next').' &gt;&gt;',157 'next_text' => T_('Next').' &gt;&gt;',
171 ) );158 ) );
172 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------159 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
173 ?>160
174161// --- --- --- --- --- --- --- --- --- --- ---
175162// MAIN CONTENT INCLUDED HERE
176 <?php163template_include( '$disp$', array(
177 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------164 // we already handled these cases above
178 template_include( '$disp$', array(165 'disp_posts' => '',
179 'disp_posts' => '', // We already handled this case above166 'disp_single' => '',
180 'disp_single' => '', // We already handled this case above167 'disp_page' => '',
181 'disp_page' => '', // We already handled this case above168) );
182 ) );169?>
183 // Note: you can customize any of the sub templates included here by
184 // copying the matching php file into your template directory.
185 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
186 ?>
187
188</div>170</div>
189<!-- =================================== START OF SIDEBAR =================================== -->
190171
191<div class="bSideBar">172<div class="bSideBar">
192173<?php
193 <?php
194 // Display container contents:174 // Display container contents:
195 template_container( NT_('Sidebar'), array(175 template_container( NT_('Sidebar'), array(
196 // The following (optional) params will be used as defaults for widgets included in this container:176 // The following (optional) params will be used as defaults for widgets included in this container:
@@ -211,26 +191,21 @@
211 'group_end' => '</ul>',191 'group_end' => '</ul>',
212 ) );192 ) );
213 ?>193 ?>
214
215</div>194</div>
216195
217<div class="clear"><img src="<?php echo $rsc_url; ?>img/blank.gif" width="1" height="1" alt="" /></div>196<div class="clear"><img src="<?php echo $rsc_url; ?>img/blank.gif" width="1" height="1" alt="" /></div>
218197
219<?php198<?php
220// ------------------------- BODY FOOTER INCLUDED HERE --------------------------199// --- --- --- --- --- --- --- --- --- --- ---
200// --- BODY FOOTER INCLUDED HERE ---
221template_include( '_body_footer.inc.php' );201template_include( '_body_footer.inc.php' );
222// Note: You can customize the default BODY footer by copying the
223// _body_footer.inc.php file into the current template folder.
224// ------------------------------- END OF FOOTER --------------------------------
225?>202?>
203</div>
226204
227</div>
228</div>205</div>
229206
230<?php207<?php
231// ------------------------- HTML FOOTER INCLUDED HERE --------------------------208// --- --- --- --- --- --- --- --- --- --- ---
209// --- HTML FOOTER INCLUDED HERE ---
232template_include( '_html_footer.inc.php' );210template_include( '_html_footer.inc.php' );
233// Note: You can customize the default HTML footer by copying the
234// _html_footer.inc.php file into the current template folder.
235// ------------------------------- END OF FOOTER --------------------------------
236?>211?>
237\ No newline at end of file212\ No newline at end of file
238213
=== modified file 'blogs/templates/nifty_corners/_item_block.inc.php'
--- blogs/templates/nifty_corners/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/nifty_corners/_item_block.inc.php 2010-01-03 09:20:31 +0000
@@ -69,19 +69,17 @@
69 'after' => ' ',69 'after' => ' ',
70 'separator' => ', ',70 'separator' => ', ',
71 ) );71 ) );
72 ?>72?>
73 </div>73</div>
7474
75 <?php75<?php
76 // ---------------------- POST CONTENT INCLUDED HERE ----------------------76// --- --- --- --- --- --- --- --- --- --- ---
77 template_include( '_item_content.inc.php', $params );77// --- POST CONTENT INCLUDED HERE ---
78 // Note: You can customize the default item feedback by copying the generic78template_include( '_item_content.inc.php', $params );
79 // /templates/_item_content.inc.php file into the current template folder.79?>
80 // -------------------------- END OF POST CONTENT -------------------------80
81 ?>81<div class="bSmallPrint">
8282<?php
83 <div class="bSmallPrint">
84 <?php
85 $Item->permanent_link();83 $Item->permanent_link();
8684
87 // Link to comments, trackbacks, etc.:85 // Link to comments, trackbacks, etc.:
@@ -112,22 +110,18 @@
112 'before' => ' &bull; ',110 'before' => ' &bull; ',
113 'after' => '',111 'after' => '',
114 ) );112 ) );
115 ?>113?>
116 </div>114</div>
117115
118 <?php116<?php
119 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------117// --- --- --- --- --- --- --- --- --- --- ---
120 template_include( '_item_feedback.inc.php', array(118// --- ITEM FEEDBACK INCLUDED HERE ---
121 'before_section_title' => '<h4>',119template_include( '_item_feedback.inc.php', array(
122 'after_section_title' => '</h4>',120 'before_section_title' => '<h4>',
123 ) );121 'after_section_title' => '</h4>',
124 // Note: You can customize the default item feedback by copying the generic122) );
125 // /templates/_item_feedback.inc.php file into the current template folder.123
126 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------124// restore previous (Blog) locale
127 ?>125locale_restore_previous();
128 </div>126?>
129 </div>127</div>
130 <?php
131 locale_restore_previous(); // Restore previous locale (Blog locale)
132
133?>
134128
=== modified file 'blogs/templates/nifty_corners/index.main.php'
--- blogs/templates/nifty_corners/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/nifty_corners/index.main.php 2010-01-03 09:20:32 +0000
@@ -11,11 +11,6 @@
11 */11 */
12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1313
14if( version_compare( $app_version, '3.0' ) < 0 )
15{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
16 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
17}
18
19// This is the main template; it may be used to display very different things.14// This is the main template; it may be used to display very different things.
20// Do inits depending on current $disp:15// Do inits depending on current $disp:
21template_init( $disp );16template_init( $disp );
@@ -42,14 +37,11 @@
42HEREDOC;37HEREDOC;
43add_headline( $custom_js );38add_headline( $custom_js );
4439
45// Include the HTML HEAD:40// --- --- --- --- --- --- --- --- --- --- ---
41// --- HTML HEADER INCLUDED HERE ---
46template_include( '_html_header.inc.php' );42template_include( '_html_header.inc.php' );
47// Note: You can customize the default HTML header by copying the
48// _html_header.inc.php file into the current template folder.
49// -------------------------------- END OF HEADER --------------------------------
50?>43?>
5144
52
53<div class="wrapper">45<div class="wrapper">
54<div class="wrapper2">46<div class="wrapper2">
5547
@@ -150,26 +142,22 @@
150 'format' => 'htmlbody',142 'format' => 'htmlbody',
151 ) );143 ) );
152 // ------------------------------ END OF REQUEST TITLE -----------------------------144 // ------------------------------ END OF REQUEST TITLE -----------------------------
153?>
154145
155<?php146// do we have a featured/intro item to display?
156// Go Grab the featured post:
157if( $Item = & get_featured_Item() )147if( $Item = & get_featured_Item() )
158{ // We have a featured/intro post to display:148{
159 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------149 // --- --- --- --- --- --- --- --- --- --- ---
150 // --- ITEM BLOCK INCLUDED HERE ---
160 template_include( '_item_block.inc.php', array(151 template_include( '_item_block.inc.php', array(
161 'feature_block' => true,152 'feature_block' => true,
162 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail153 'content_mode' => 'auto',
163 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode154 'intro_mode' => 'normal',
164 'item_class' => 'featured_post',155 'item_class' => 'featured_post',
165 'image_size' => 'fit-400x320',156 'image_size' => 'fit-400x320',
166 ) );157 ) );
167 // ----------------------------END ITEM BLOCK ----------------------------
168}158}
169?>
170159
171<?php160// ------------------------------------ START OF POSTS ----------------------------------------
172 // ------------------------------------ START OF POSTS ----------------------------------------
173 // Display message if no post:161 // Display message if no post:
174 display_if_empty();162 display_if_empty();
175163
@@ -185,12 +173,12 @@
185 'date_format' => '#',173 'date_format' => '#',
186 ) );174 ) );
187175
188 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------176 // --- --- --- --- --- --- --- --- --- --- ---
177 // --- ITEM BLOCK INCLUDED HERE ---
189 template_include( '_item_block.inc.php', array(178 template_include( '_item_block.inc.php', array(
190 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail179 'content_mode' => 'auto',
191 'image_size' => 'fit-400x320',180 'image_size' => 'fit-400x320',
192 ) );181 ) );
193 // ----------------------------END ITEM BLOCK ----------------------------
194182
195 } // ---------------------------------- END OF POSTS ------------------------------------ ?>183 } // ---------------------------------- END OF POSTS ------------------------------------ ?>
196184
@@ -204,31 +192,24 @@
204 'next_text' => T_('Next').' &gt;&gt;',192 'next_text' => T_('Next').' &gt;&gt;',
205 ) );193 ) );
206 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------194 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
207 ?>195
208196// --- --- --- --- --- --- --- --- --- --- ---
209197// MAIN CONTENT INCLUDED HERE
210 <?php198template_include( '$disp$', array(
211 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------199 // we already handled these cases above
212 template_include( '$disp$', array(200 'disp_posts' => '',
213 'disp_posts' => '', // We already handled this case above201 'disp_single' => '',
214 'disp_single' => '', // We already handled this case above202 'disp_page' => '',
215 'disp_page' => '', // We already handled this case above203) );
216 ) );204?>
217 // Note: you can customize any of the sub templates included here by205</div>
218 // copying the matching php file into your template directory.206
219 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------207</div>
220 ?>208
221
222
223</div>
224</div>
225
226
227<!-- =================================== START OF SIDEBAR =================================== -->
228<div class="bSideBar">209<div class="bSideBar">
210
229<div class="innerwrap">211<div class="innerwrap">
230212<?php
231 <?php
232 // ------------------------- "Sidebar" CONTAINER EMBEDDED HERE --------------------------213 // ------------------------- "Sidebar" CONTAINER EMBEDDED HERE --------------------------
233 template_container( NT_('Sidebar'), array(214 template_container( NT_('Sidebar'), array(
234 // The following (optional) params will be used as defaults for widgets included in this container:215 // The following (optional) params will be used as defaults for widgets included in this container:
@@ -253,27 +234,23 @@
253 ) );234 ) );
254 // ----------------------------- END OF "Sidebar" CONTAINER -----------------------------235 // ----------------------------- END OF "Sidebar" CONTAINER -----------------------------
255 ?>236 ?>
237</div>
256238
257</div>
258</div>239</div>
259240
260<div class="clear"><img src="<?php echo $rsc_url; ?>img/blank.gif" width="1" height="1" alt="" /></div>241<div class="clear"><img src="<?php echo $rsc_url; ?>img/blank.gif" width="1" height="1" alt="" /></div>
261242
262<?php243<?php
263// ------------------------- BODY FOOTER INCLUDED HERE --------------------------244// --- --- --- --- --- --- --- --- --- --- ---
245// --- BODY FOOTER INCLUDED HERE ---
264template_include( '_body_footer.inc.php' );246template_include( '_body_footer.inc.php' );
265// Note: You can customize the default BODY footer by copying the
266// _body_footer.inc.php file into the current template folder.
267// ------------------------------- END OF FOOTER --------------------------------
268?>247?>
248</div>
269249
270</div>
271</div>250</div>
272251
273<?php252<?php
274// ------------------------- HTML FOOTER INCLUDED HERE --------------------------253// --- --- --- --- --- --- --- --- --- --- ---
254// --- HTML FOOTER INCLUDED HERE ---
275template_include( '_html_footer.inc.php' );255template_include( '_html_footer.inc.php' );
276// Note: You can customize the default HTML footer by copying the
277// _html_footer.inc.php file into the current template folder.
278// ------------------------------- END OF FOOTER --------------------------------
279?>256?>
280\ No newline at end of file257\ No newline at end of file
281258
=== modified file 'blogs/templates/photoblog/_html_header.inc.php'
--- blogs/templates/photoblog/_html_header.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/photoblog/_html_header.inc.php 2010-01-03 09:20:32 +0000
@@ -5,8 +5,6 @@
5 * This is meant to be included in a page template.5 * This is meant to be included in a page template.
6 * Note: This is also included in the popup: do not include site navigation!6 * Note: This is also included in the popup: do not include site navigation!
7 *7 *
8 * -at- tutorial page placeholder _html_header.inc.php
9 *
10 * @package templates8 * @package templates
11 * @subpackage photoblog9 * @subpackage photoblog
12 */10 */
@@ -55,12 +53,10 @@
55</head>53</head>
5654
57<body>55<body>
58
59<?php56<?php
60// ---------------------------- TOOLBAR INCLUDED HERE ----------------------------57// --- --- --- --- --- --- --- --- --- --- ---
61require $templates_path.'_toolbar.inc.php';58// --- TOOLBAR INCLUDED HERE ---
62// ------------------------------- END OF TOOLBAR --------------------------------59template_include( '_toolbar.inc.php' );
63
64echo "\n";60echo "\n";
65if( is_logged_in() )61if( is_logged_in() )
66{62{
@@ -71,5 +67,4 @@
71 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';67 echo '<div id="template_wrapper" class="template_wrapper_anonymous">';
72}68}
73echo "\n";69echo "\n";
74?>70?>
75<!-- Start of template_wrapper -->
76\ No newline at end of file71\ No newline at end of file
7772
=== modified file 'blogs/templates/photoblog/_item_block.inc.php'
--- blogs/templates/photoblog/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/photoblog/_item_block.inc.php 2010-01-03 09:20:32 +0000
@@ -99,20 +99,17 @@
99 'after' => '</span>',99 'after' => '</span>',
100 'date_format' => locale_datefmt().' H:i',100 'date_format' => locale_datefmt().' H:i',
101 ) );101 ) );
102 ?>102?>
103103</div>
104 </div>104
105105<?php
106 <?php106// --- --- --- --- --- --- --- --- --- --- ---
107 // ---------------------- POST CONTENT INCLUDED HERE ----------------------107// --- POST CONTENT INCLUDED HERE ---
108 template_include( '_item_content.inc.php', $params );108template_include( '_item_content.inc.php', $params );
109 // Note: You can customize the default item feedback by copying the generic109?>
110 // /templates/_item_feedback.inc.php file into the current template folder.110
111 // -------------------------- END OF POST CONTENT -------------------------111<div class="bSmallPrint">
112 ?>112<?php
113
114 <div class="bSmallPrint">
115 <?php
116 $Item->author( array(113 $Item->author( array(
117 'before' => T_('By').' ',114 'before' => T_('By').' ',
118 'after' => ' &bull; ',115 'after' => ' &bull; ',
@@ -149,26 +146,19 @@
149 'target' => '',146 'target' => '',
150 'podcast' => false, // DO NOT display mp3 player if post type is podcast147 'podcast' => false, // DO NOT display mp3 player if post type is podcast
151 ) );148 ) );
152 ?>149?>
153150</div>
154 </div>
155 </div>
156
157 <?php
158 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------
159 template_include( '_item_feedback.inc.php', array(
160 'before_section_title' => '<h4>',
161 'after_section_title' => '</h4>',
162 ) );
163 // Note: You can customize the default item feedback by copying the generic
164 // /templates/_item_feedback.inc.php file into the current template folder.
165 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
166 ?>
167
168 <?php
169 locale_restore_previous(); // Restore previous locale (Blog locale)
170 ?>
171151
172</div>152</div>
173<?php153<?php
154// --- --- --- --- --- --- --- --- --- --- ---
155// --- ITEM FEEDBACK INCLUDED HERE ---
156template_include( '_item_feedback.inc.php', array(
157 'before_section_title' => '<h4>',
158 'after_section_title' => '</h4>',
159) );
160
161// restore previous (Blog) locale
162locale_restore_previous();
174?>163?>
164</div>
175165
=== modified file 'blogs/templates/photoblog/feedback_popup.main.php'
--- blogs/templates/photoblog/feedback_popup.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/photoblog/feedback_popup.main.php 2010-01-03 09:20:32 +0000
@@ -11,17 +11,13 @@
11 */11 */
12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1313
14
15// Note: even if we request the same post as $Item above, the following will do more restrictions (dates, etc.)14// Note: even if we request the same post as $Item above, the following will do more restrictions (dates, etc.)
16// Do inits depending on current $disp:15// Do inits depending on current $disp:
17template_init( $disp ); // disp will normally be "feedback-popup" here16template_init( $disp ); // disp will normally be "feedback-popup" here
1817
1918// --- --- --- --- --- --- --- --- --- --- ---
20// -------------------------- HTML HEADER INCLUDED HERE --------------------------19// --- HTML HEADER INCLUDED HERE ---
21template_include( '_html_header.inc.php' );20template_include( '_html_header.inc.php' );
22// Note: You can customize the default HTML header by copying the
23// _html_header.inc.php file into the current template folder.
24// -------------------------------- END OF HEADER --------------------------------
25?>21?>
2622
27<div class="comments_popup">23<div class="comments_popup">
@@ -47,27 +43,21 @@
47 ) );43 ) );
48// ------------------------------ END OF REQUEST TITLE -----------------------------44// ------------------------------ END OF REQUEST TITLE -----------------------------
4945
50
51// Normally, there should only be one item to display...46// Normally, there should only be one item to display...
52while( $Item = & mainlist_get_item() )47while( $Item = & mainlist_get_item() )
53{ // For each blog post, do everything below up to the closing curly brace "}"48{
54 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------49 // --- --- --- --- --- --- --- --- --- --- ---
50 // --- ITEM FEEDBACK INCLUDED HERE ---
55 template_include( '_item_feedback.inc.php', array(51 template_include( '_item_feedback.inc.php', array(
56 'before_section_title' => '<h4>',52 'before_section_title' => '<h4>',
57 'after_section_title' => '</h4>',53 'after_section_title' => '</h4>',
58 ) );54 ) );
59 // Note: You can customize the default item feedback by copying the generic
60 // /templates/_item_feedback.inc.php file into the current template folder.
61 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
62}55}
63?>56?>
64
65</div>57</div>
6658
67<?php59<?php
68// ------------------------- HTML FOOTER INCLUDED HERE --------------------------60// --- --- --- --- --- --- --- --- --- --- ---
61// --- HTML FOOTER INCLUDED HERE ---
69template_include( '_html_footer.inc.php' );62template_include( '_html_footer.inc.php' );
70// Note: You can customize the default HTML footer by copying the
71// _html_footer.inc.php file into the current template folder.
72// ------------------------------- END OF FOOTER --------------------------------
73?>63?>
74\ No newline at end of file64\ No newline at end of file
7565
=== modified file 'blogs/templates/photoblog/index.main.php'
--- blogs/templates/photoblog/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/photoblog/index.main.php 2010-01-03 09:20:32 +0000
@@ -11,22 +11,15 @@
11 */11 */
12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );12if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1313
14if( version_compare( $app_version, '3.0' ) < 0 )
15{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
16 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
17}
18
19// This is the main template; it may be used to display very different things.14// This is the main template; it may be used to display very different things.
20// Do inits depending on current $disp:15// Do inits depending on current $disp:
21template_init( $disp );16template_init( $disp );
2217
23require_js( 'functions.js' ); // for opening popup window (comments)18require_js( 'functions.js' ); // for opening popup window (comments)
2419
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- --- --- --- --- --- --- --- --- --- ---
21// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );22template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the
28// _html_header.inc.php file into the current template folder.
29// -------------------------------- END OF HEADER --------------------------------
30?>23?>
3124
32<div class="PageTop">25<div class="PageTop">
@@ -129,67 +122,52 @@
129 'categories_text' => T_('Albums').': ',122 'categories_text' => T_('Albums').': ',
130 ) );123 ) );
131 // ------------------------------ END OF REQUEST TITLE -----------------------------124 // ------------------------------ END OF REQUEST TITLE -----------------------------
132 ?>125
133126// do we have a featured/intro item to display?
134 <?php127if( $Item = & get_featured_Item() )
135 // Go Grab the featured post:128{
136 if( $Item = & get_featured_Item() )129 // --- --- --- --- --- --- --- --- --- --- ---
137 { // We have a featured/intro post to display:130 // --- ITEM BLOCK INCLUDED HERE ---
138 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------131 template_include( '_item_block.inc.php', array(
139 template_include( '_item_block.inc.php', array(132 'feature_block' => true,
140 'feature_block' => true,133 'content_mode' => 'full',
141 'content_mode' => 'full', // We want regular "full" content, even in category browsing: i-e no excerpt or thumbnail134 'intro_mode' => 'normal',
142 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode135 'item_class' => 'featured_post',
143 'item_class' => 'featured_post',136 'image_size' => 'fit-400x320',
144 ) );137 ) );
145 // ----------------------------END ITEM BLOCK ----------------------------138}
146 }139
147 ?>140// ------------------------------------ START OF POSTS ----------------------------------------
148
149 <?php
150 // ------------------------------------ START OF POSTS ----------------------------------------
151 // Display message if no post:141 // Display message if no post:
152 display_if_empty();142 display_if_empty();
153143
154 while( $Item = & mainlist_get_item() )144// do this loop for each item we need to display (aka 'the posts loop')
155 { // For each blog post:145while( $Item = & mainlist_get_item() )
156 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------146{
157 template_include( '_item_block.inc.php', array(147 // --- --- --- --- --- --- --- --- --- --- ---
158 'content_mode' => 'full', // We want regular "full" content, even in category browsing: i-e no excerpt or thumbnail148 // --- ITEM BLOCK INCLUDED HERE ---
159 ) );149 template_include( '_item_block.inc.php', array(
160 // ----------------------------END ITEM BLOCK ----------------------------150 'content_mode' => 'full',
161 } // ---------------------------------- END OF POSTS ------------------------------------151 ) );
162 ?>152}
163153
164154// --- --- --- --- --- --- --- --- --- --- ---
165 <?php155// MAIN CONTENT INCLUDED HERE
166 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------156template_include( '$disp$', array(
167 template_include( '$disp$', array(157 // we already handled these cases above
168 'disp_posts' => '', // We already handled this case above158 'disp_posts' => '',
169 'disp_single' => '', // We already handled this case above159 'disp_single' => '',
170 'disp_page' => '', // We already handled this case above160 'disp_page' => '',
171 ) );161) );
172 // Note: you can customize any of the sub templates included here by162?>
173 // copying the matching php file into your template directory.
174 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------
175 ?>
176
177</div>163</div>
178164
179
180<?php165<?php
181// ------------------------- BODY FOOTER INCLUDED HERE --------------------------166// --- --- --- --- --- --- --- --- --- --- ---
167// --- BODY FOOTER INCLUDED HERE ---
182template_include( '_body_footer.inc.php' );168template_include( '_body_footer.inc.php' );
183// Note: You can customize the default BODY footer by copying the169
184// _body_footer.inc.php file into the current template folder.170// --- --- --- --- --- --- --- --- --- --- ---
185// ------------------------------- END OF FOOTER --------------------------------171// --- HTML FOOTER INCLUDED HERE ---
186?>
187
188
189<?php
190// ------------------------- HTML FOOTER INCLUDED HERE --------------------------
191template_include( '_html_footer.inc.php' );172template_include( '_html_footer.inc.php' );
192// Note: You can customize the default HTML footer by copying the
193// _html_footer.inc.php file into the current template folder.
194// ------------------------------- END OF FOOTER --------------------------------
195?>173?>
196\ No newline at end of file174\ No newline at end of file
197175
=== modified file 'blogs/templates/pixelgreen/_item_block.inc.php'
--- blogs/templates/pixelgreen/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/pixelgreen/_item_block.inc.php 2010-01-03 09:20:32 +0000
@@ -41,18 +41,18 @@
41 'after' => '</strong>',41 'after' => '</strong>',
42 ) );42 ) );
43 $Item->msgform_link();43 $Item->msgform_link();
44 ?></p>44?>
45 <?php45</p>
46 // ---------------------- POST CONTENT INCLUDED HERE ----------------------46<?php
47 template_include( '_item_content.inc.php', $params );47// --- --- --- --- --- --- --- --- --- --- ---
48 // Note: You can customize the default item feedback by copying the generic48// --- POST CONTENT INCLUDED HERE ---
49 // /templates/_item_feedback.inc.php file into the current template folder.49template_include( '_item_content.inc.php', $params );
50 // -------------------------- END OF POST CONTENT -------------------------50?>
51 ?>51
5252<div class="post-footer">
53 <div class="post-footer">53
54 <div class="bSmallHead">54<div class="bSmallHead">
55 <?php55<?php
56 $Item->categories( array(56 $Item->categories( array(
57 'before' => T_('Categories').': ',57 'before' => T_('Categories').': ',
58 'after' => ' ',58 'after' => ' ',
@@ -129,24 +129,20 @@
129 'before' => ' &bull; ',129 'before' => ' &bull; ',
130 'after' => '',130 'after' => '',
131 ) );131 ) );
132 ?>132?>
133 </div>133</div>
134 </div>134
135 <?php135</div>
136 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------136
137 template_include( '_item_feedback.inc.php', array(
138 'before_section_title' => '<h4>',
139 'after_section_title' => '</h4>',
140 ) );
141 // Note: You can customize the default item feedback by copying the generic
142 // /templates/_item_feedback.inc.php file into the current template folder.
143 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
144 ?>
145
146 <?php
147 locale_restore_previous(); // Restore previous locale (Blog locale)
148 ?>
149
150</div>
151<?php137<?php
138// --- --- --- --- --- --- --- --- --- --- ---
139// --- ITEM FEEDBACK INCLUDED HERE ---
140template_include( '_item_feedback.inc.php', array(
141 'before_section_title' => '<h4>',
142 'after_section_title' => '</h4>',
143) );
144
145// restore previous (Blog) locale
146locale_restore_previous();
152?>147?>
148</div>
153149
=== modified file 'blogs/templates/pixelgreen/index.main.php'
--- blogs/templates/pixelgreen/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/pixelgreen/index.main.php 2010-01-03 09:20:32 +0000
@@ -12,24 +12,15 @@
12 */12 */
13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );13if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1414
15if( version_compare( $app_version, '3.0' ) < 0 )
16{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
17 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
18}
19
20// This is the main template; it may be used to display very different things.15// This is the main template; it may be used to display very different things.
21// Do inits depending on current $disp:16// Do inits depending on current $disp:
22template_init( $disp );17template_init( $disp );
2318
2419// --- --- --- --- --- --- --- --- --- --- ---
25// -------------------------- HTML HEADER INCLUDED HERE --------------------------20// --- HTML HEADER INCLUDED HERE ---
26template_include( '_html_header.inc.php' );21template_include( '_html_header.inc.php' );
27// Note: You can customize the default HTML header by copying the generic
28// /templates/_html_header.inc.php file into the current template folder.
29// -------------------------------- END OF HEADER --------------------------------
30?>22?>
3123
32<!-- wrap starts here -->
33<div id="wrap">24<div id="wrap">
3425
35 <div id="header">26 <div id="header">
@@ -111,50 +102,44 @@
111 'format' => 'htmlbody',102 'format' => 'htmlbody',
112 ) );103 ) );
113 // ------------------------------ END OF REQUEST TITLE -----------------------------104 // ------------------------------ END OF REQUEST TITLE -----------------------------
114 ?>105
115 <?php106// --- --- --- --- --- --- --- --- --- --- ---
116 // ------------------------- SIDEBAR INCLUDED HERE --------------------------107// --- SIDEBAR INCLUDED HERE ---
117 template_include( '_sidebar.inc.php' );108template_include( '_sidebar.inc.php' );
118 // Note: You can customize the default BODY footer by copying the109?>
119 // _body_footer.inc.php file into the current template folder.110
120 // ----------------------------- END OF SIDEBAR -----------------------------111<div id="main">
121 ?>112<?php
122113// do we have a featured/intro item to display?
123 <div id="main">114if( $Item = & get_featured_Item() )
124 <?php115{
125 // Go Grab the featured post:116 // --- --- --- --- --- --- --- --- --- --- ---
126 if( $Item = & get_featured_Item() )117 // --- ITEM BLOCK INCLUDED HERE ---
127 { // We have a featured/intro post to display:118 template_include( '_item_block.inc.php', array(
128 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------119 'feature_block' => true,
129 template_include( '_item_block.inc.php', array(120 'content_mode' => 'auto',
130 'feature_block' => true,121 'intro_mode' => 'normal',
131 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail122 'item_class' => 'post featured_post',
132 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode123 'image_size' => 'fit-400x320',
133 'item_class' => 'post featured_post',124 ) );
134 'image_size' => 'fit-400x320',125}
135 ) );126
136 // ----------------------------END ITEM BLOCK ----------------------------127// --------------------------------- START OF POSTS -------------------------------------
137 }
138 ?>
139
140 <?php
141 // --------------------------------- START OF POSTS -------------------------------------
142 // Display message if no post:128 // Display message if no post:
143 display_if_empty();129 display_if_empty();
144130
145 while( $Item = & mainlist_get_item() )131// do this loop for each item we need to display (aka 'the posts loop')
146 { // For each blog post:132while( $Item = & mainlist_get_item() )
147 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------133{
148 template_include( '_item_block.inc.php', array(134 // --- --- --- --- --- --- --- --- --- --- ---
149 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail135 // --- ITEM BLOCK INCLUDED HERE ---
150 'image_size' => 'fit-400x320',136 template_include( '_item_block.inc.php', array(
151 ) );137 'content_mode' => 'auto',
152 // ----------------------------END ITEM BLOCK ----------------------------138 'image_size' => 'fit-400x320',
153 } // ---------------------------------- END OF POSTS ------------------------------------139 ) );
154 ?>140}
155141
156 <?php142// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
157 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
158 mainlist_page_links( array(143 mainlist_page_links( array(
159 'block_start' => '<p class="center"><strong>',144 'block_start' => '<p class="center"><strong>',
160 'block_end' => '</strong></p>',145 'block_end' => '</strong></p>',
@@ -162,30 +147,26 @@
162 'next_text' => '&gt;&gt;',147 'next_text' => '&gt;&gt;',
163 ) );148 ) );
164 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------149 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
165 ?>150
166151// --- --- --- --- --- --- --- --- --- --- ---
167 <?php152// MAIN CONTENT INCLUDED HERE
168 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------153template_include( '$disp$', array(
169 //template_include( '$disp$', array() );154 // we already handled these cases above
170 template_include( '$disp$', array(155 'disp_posts' => '',
171 'disp_posts' => '', // We already handled this case above156 'disp_single' => '',
172 'disp_single' => '', // We already handled this case above157 'disp_page' => '',
173 'disp_page' => '', // We already handled this case above158) );
174 ) );159?>
175 // Note: you can customize any of the sub templates included here by160</div>
176 // copying the matching php file into your template directory.161
177 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------162</div>
178 ?>163
179164</div>
180165
181 </div>166<div id="footer">
182167
183 <!-- content-wrap ends here -->168<div id="footer-content">
184 </div></div>169<?php
185
186<!-- footer starts here -->
187<div id="footer"><div id="footer-content">
188 <?php
189 // ------------------------- "Footer" CONTAINER EMBEDDED HERE --------------------------170 // ------------------------- "Footer" CONTAINER EMBEDDED HERE --------------------------
190 // Display container and contents:171 // Display container and contents:
191 template_container( NT_('Footer'), array(172 template_container( NT_('Footer'), array(
192173
=== modified file 'blogs/templates/terrafirma/_item_block.inc.php'
--- blogs/templates/terrafirma/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/terrafirma/_item_block.inc.php 2010-01-03 09:20:32 +0000
@@ -45,21 +45,18 @@
45 'before' => '<em class="bPostdate">',45 'before' => '<em class="bPostdate">',
46 'after' => '</em>',46 'after' => '</em>',
47 ));47 ));
48 ?>48?>
49 </div>49</div>
50 <h2 class="bTitle"><?php $Item->title(); ?></h2>50
51 </div>51<h2 class="bTitle"><?php $Item->title(); ?></h2>
5252</div>
53 <?php53
54 // ---------------------- POST CONTENT INCLUDED HERE ----------------------54<?php
55 template_include( '_item_content.inc.php', $params );55// --- --- --- --- --- --- --- --- --- --- ---
56 // Note: You can customize the default item feedback by copying the generic56// --- POST CONTENT INCLUDED HERE ---
57 // /templates/_item_feedback.inc.php file into the current template folder.57template_include( '_item_content.inc.php', $params );
58 // -------------------------- END OF POST CONTENT -------------------------58
59 ?>59// List all tags attached to this post:
60
61 <?php
62 // List all tags attached to this post:
63 $Item->tags( array(60 $Item->tags( array(
64 'before' => '<div class="post-tags">'.T_('Tags').': ',61 'before' => '<div class="post-tags">'.T_('Tags').': ',
65 'after' => '</div>',62 'after' => '</div>',
@@ -112,26 +109,20 @@
112 'link_title' => '#',109 'link_title' => '#',
113 'use_popup' => false,110 'use_popup' => false,
114 ) );111 ) );
115 ?>112?>
116 </li>113</li>
117 </ul>114</ul>
118 </div>
119
120 <?php
121 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------
122 template_include( '_item_feedback.inc.php', array(
123 'before_section_title' => '<h3>',
124 'after_section_title' => '</h3>',
125 ) );
126 // Note: You can customize the default item feedback by copying the generic
127 // /templates/_item_feedback.inc.php file into the current template folder.
128 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
129 ?>
130
131 <?php
132 locale_restore_previous(); // Restore previous locale (Blog locale)
133 ?>
134
135</div>115</div>
116
136<?php117<?php
118// --- --- --- --- --- --- --- --- --- --- ---
119// --- ITEM FEEDBACK INCLUDED HERE ---
120template_include( '_item_feedback.inc.php', array(
121 'before_section_title' => '<h3>',
122 'after_section_title' => '</h3>',
123) );
124
125// restore previous (Blog) locale
126locale_restore_previous();
137?>127?>
128</div>
138129
=== modified file 'blogs/templates/terrafirma/index.main.php'
--- blogs/templates/terrafirma/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/terrafirma/index.main.php 2010-01-03 09:20:32 +0000
@@ -15,21 +15,13 @@
15 */15 */
16if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );16if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1717
18if( version_compare( $app_version, '3.0' ) < 0 )
19{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
20 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
21}
22
23// This is the main template; it may be used to display very different things.18// This is the main template; it may be used to display very different things.
24// Do inits depending on current $disp:19// Do inits depending on current $disp:
25template_init( $disp );20template_init( $disp );
2621
2722// --- --- --- --- --- --- --- --- --- --- ---
28// -------------------------- HTML HEADER INCLUDED HERE --------------------------23// --- HTML HEADER INCLUDED HERE ---
29template_include( '_html_header.inc.php' );24template_include( '_html_header.inc.php' );
30// Note: You can customize the default HTML header by copying the generic
31// /templates/_html_header.inc.php file into the current template folder.
32// -------------------------------- END OF HEADER --------------------------------
33?>25?>
34<div id="wrapper">26<div id="wrapper">
35 <div id="upbg"></div>27 <div id="upbg"></div>
@@ -122,42 +114,36 @@
122 ) );114 ) );
123 }115 }
124 // ----------------------------- END OF REQUEST TITLE ----------------------------116 // ----------------------------- END OF REQUEST TITLE ----------------------------
125 ?>117
126118// do we have a featured/intro item to display?
127 <?php119if( $Item = & get_featured_Item() )
128 // Go Grab the featured post:120{
129 if( $Item = & get_featured_Item() )121 // --- --- --- --- --- --- --- --- --- --- ---
130 { // We have a featured/intro post to display:122 // --- ITEM BLOCK INCLUDED HERE ---
131 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------123 template_include( '_item_block.inc.php', array(
132 template_include( '_item_block.inc.php', array(124 'feature_block' => true,
133 'feature_block' => true,125 'content_mode' => 'auto',
134 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail126 'intro_mode' => 'normal',
135 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode127 'item_class' => 'bPost featured_post',
136 'item_class' => 'bPost featured_post',128 'image_size' => 'fit-400x320',
137 'image_size' => 'fit-400x320',129 ) );
138 ) );130}
139 // ----------------------------END ITEM BLOCK ----------------------------131
140 }132// --------------------------------- START OF POSTS -------------------------------------
141 ?>
142
143 <?php
144 // --------------------------------- START OF POSTS -------------------------------------
145 // Display message if no post:133 // Display message if no post:
146 display_if_empty();134 display_if_empty();
147135
148 while( $Item = & mainlist_get_item() )136// do this loop for each item we need to display (aka 'the posts loop')
149 { // For each blog post:137while( $Item = & mainlist_get_item() )
150 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------138{
151 template_include( '_item_block.inc.php', array(139 // --- --- --- --- --- --- --- --- --- --- ---
152 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail140 // --- ITEM BLOCK INCLUDED HERE ---
153 'image_size' => 'fit-400x320',141 template_include( '_item_block.inc.php', array(
154 ) );142 'content_mode' => 'auto',
155 // ----------------------------END ITEM BLOCK ----------------------------143 'image_size' => 'fit-400x320',
156 } // ---------------------------------- END OF POSTS ------------------------------------144 ) );
157 ?>145}
158146// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
159 <?php
160 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
161 mainlist_page_links( array(147 mainlist_page_links( array(
162 'block_start' => '<p class="center"><strong>',148 'block_start' => '<p class="center"><strong>',
163 'block_end' => '</strong></p>',149 'block_end' => '</strong></p>',
@@ -165,28 +151,20 @@
165 'next_text' => '&gt;&gt;',151 'next_text' => '&gt;&gt;',
166 ) );152 ) );
167 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------153 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
168 ?>154
169155// --- --- --- --- --- --- --- --- --- --- ---
170156// MAIN CONTENT INCLUDED HERE
171 <?php157template_include( '$disp$', array(
172 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------158 // we already handled these cases above
173 template_include( '$disp$', array(159 'disp_posts' => '',
174 'disp_posts' => '', // We already handled this case above160 'disp_single' => '',
175 'disp_single' => '', // We already handled this case above161 'disp_page' => '',
176 'disp_page' => '', // We already handled this case above162) );
177 ) );163?>
178 // Note: you can customize any of the sub templates included here by164</div>
179 // copying the matching php file into your template directory.165
180 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------166<div class="bSideBar">
181 ?>167<?php
182
183 </div>
184
185
186 <!-- =================================== START OF SIDEBAR =================================== -->
187 <div class="bSideBar">
188
189 <?php
190 // ------------------------- "Sidebar" CONTAINER EMBEDDED HERE --------------------------168 // ------------------------- "Sidebar" CONTAINER EMBEDDED HERE --------------------------
191 // Display container contents:169 // Display container contents:
192 template_container( NT_('Sidebar'), array(170 template_container( NT_('Sidebar'), array(
@@ -243,19 +221,17 @@
243 'after' => '',221 'after' => '',
244 ) );222 ) );
245 ?>223 ?>
246 </span>224</span>
247225<br />Design: <a href="http://www.nodethirtythree.com">Node33</a> | <a href="http://wpthemepark.com/themes/terrafirma/">Sadish Bala</a>
248 <br />Design: <a href="http://www.nodethirtythree.com">Node33</a> | <a href="http://wpthemepark.com/themes/terrafirma/">Sadish Bala</a>226</p>
249227</div>
250 </p>228
251 </div>229</div>
252 </div>230
253</div>231</div>
254232
255<?php233<?php
256// ------------------------- HTML FOOTER INCLUDED HERE --------------------------234// --- --- --- --- --- --- --- --- --- --- ---
235// --- HTML FOOTER INCLUDED HERE ---
257template_include( '_html_footer.inc.php' );236template_include( '_html_footer.inc.php' );
258// Note: You can customize the default HTML footer by copying the
259// _html_footer.inc.php file into the current template folder.
260// ------------------------------- END OF FOOTER --------------------------------
261?>237?>
262\ No newline at end of file238\ No newline at end of file
263239
=== modified file 'blogs/templates/vastitude/_item_block.inc.php'
--- blogs/templates/vastitude/_item_block.inc.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/vastitude/_item_block.inc.php 2010-01-03 09:20:32 +0000
@@ -70,16 +70,21 @@
70 'include_external' => true,70 'include_external' => true,
71 'link_categories' => true,71 'link_categories' => true,
72 ) );72 ) );
73 ?>73?>
74 </div>74</div>
75 </div><!-- END SMALLHEAD DIV -->75
76 </div><!-- END HEAD DIV -->76</div>
77 <?php77
78 // ---------------------- POST CONTENT INCLUDED HERE ----------------------78</div>
79 template_include( '_item_content.inc.php', $params );79
80 ?>80<?php
81 <div class="bSmallPrint">81// --- --- --- --- --- --- --- --- --- --- ---
82 <?php82// --- POST CONTENT INCLUDED HERE ---
83template_include( '_item_content.inc.php', $params );
84?>
85
86<div class="bSmallPrint">
87<?php
83 // List all tags attached to this post:88 // List all tags attached to this post:
84 $Item->tags( array(89 $Item->tags( array(
85 'before' => '<div class="posttags">'.T_('Tags').': ',90 'before' => '<div class="posttags">'.T_('Tags').': ',
@@ -115,23 +120,18 @@
115 'before' => ' &nbsp; ',120 'before' => ' &nbsp; ',
116 'after' => '',121 'after' => '',
117 ) );122 ) );
118 ?>123?>
119 </div> <!-- END bSmallPrint DIV -->
120 <?php
121 // ------------------ FEEDBACK (COMMENTS/TRACKBACKS) INCLUDED HERE ------------------
122 template_include( '_item_feedback.inc.php', array(
123 'before_section_title' => '<h4>',
124 'after_section_title' => '</h4>',
125 ) );
126 // Note: You can customize the default item feedback by copying the generic
127 // /templates/_item_feedback.inc.php file into the current template folder.
128 // ---------------------- END OF FEEDBACK (COMMENTS/TRACKBACKS) ---------------------
129 ?>
130
131 <?php
132 locale_restore_previous(); // Restore previous locale (Blog locale)
133 ?>
134
135</div>124</div>
125
136<?php126<?php
127// --- --- --- --- --- --- --- --- --- --- ---
128// --- ITEM FEEDBACK INCLUDED HERE ---
129template_include( '_item_feedback.inc.php', array(
130 'before_section_title' => '<h4>',
131 'after_section_title' => '</h4>',
132) );
133
134// restore previous (Blog) locale
135locale_restore_previous();
137?>136?>
137</div>
138138
=== modified file 'blogs/templates/vastitude/index.main.php'
--- blogs/templates/vastitude/index.main.php 2010-01-02 08:34:34 +0000
+++ blogs/templates/vastitude/index.main.php 2010-01-03 09:20:32 +0000
@@ -16,24 +16,15 @@
16 */16 */
17if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );17if( !defined('QP_MAIN_INIT') ) die( 'Please, do not access this page directly.' );
1818
19if( version_compare( $app_version, '3.0' ) < 0 )
20{ // Older templates (versions 2.x and above) should work on newer b2evo versions, but newer templates may not work on older b2evo versions.
21 die( 'This template is designed for b2evolution 3.0 and above. Please <a href="http://b2evolution.net/downloads/index.html">upgrade your b2evolution</a>.' );
22}
23
24// This is the main template; it may be used to display very different things.19// This is the main template; it may be used to display very different things.
25// Do inits depending on current $disp:20// Do inits depending on current $disp:
26template_init( $disp );21template_init( $disp );
2722
2823// --- --- --- --- --- --- --- --- --- --- ---
29// -------------------------- HTML HEADER INCLUDED HERE --------------------------24// --- HTML HEADER INCLUDED HERE ---
30template_include( '_html_header.inc.php' );25template_include( '_html_header.inc.php' );
31// Note: You can customize the default HTML header by copying the generic
32// /templates/_html_header.inc.php file into the current template folder.
33// -------------------------------- END OF HEADER --------------------------------
34?>26?>
3527
36
37<div id="prewrap">28<div id="prewrap">
38 <?php29 <?php
39 // ------------------------- "Page Top" CONTAINER EMBEDDED HERE --------------------------30 // ------------------------- "Page Top" CONTAINER EMBEDDED HERE --------------------------
@@ -122,42 +113,37 @@
122 'format' => 'htmlbody',113 'format' => 'htmlbody',
123 ) );114 ) );
124 // ----------------------------- END OF REQUEST TITLE ----------------------------115 // ----------------------------- END OF REQUEST TITLE ----------------------------
125 ?>116
126117// do we have a featured/intro item to display?
127 <?php118if( $Item = & get_featured_Item() )
128 // Go Grab the featured post:119{
129 if( $Item = & get_featured_Item() )120 // --- --- --- --- --- --- --- --- --- --- ---
130 { // We have a featured/intro post to display:121 // --- ITEM BLOCK INCLUDED HERE ---
131 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------122 template_include( '_item_block.inc.php', array(
132 template_include( '_item_block.inc.php', array(123 'feature_block' => true,
133 'feature_block' => true,124 'content_mode' => 'auto',
134 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail125 'intro_mode' => 'normal',
135 'intro_mode' => 'normal', // Intro posts will be displayed in normal mode126 'item_class' => 'featured_post',
136 'item_class' => 'featured_post',127 'image_size' => 'fit-400x320',
137 'image_size' => 'fit-400x320',128 ) );
138 ) );129}
139 // ----------------------------END ITEM BLOCK ----------------------------130
140 }131// --------------------------------- START OF POSTS -------------------------------------
141 ?>
142
143 <?php
144 // --------------------------------- START OF POSTS -------------------------------------
145 // Display message if no post:132 // Display message if no post:
146 display_if_empty();133 display_if_empty();
147134
148 while( $Item = & mainlist_get_item() )135// do this loop for each item we need to display (aka 'the posts loop')
149 { // For each blog post:136while( $Item = & mainlist_get_item() )
150 // ---------------------- ITEM BLOCK INCLUDED HERE ------------------------137{
151 template_include( '_item_block.inc.php', array(138 // --- --- --- --- --- --- --- --- --- --- ---
152 'content_mode' => 'auto', // 'auto' will auto select depending on $disp-detail139 // --- ITEM BLOCK INCLUDED HERE ---
153 'image_size' => 'fit-400x320',140 template_include( '_item_block.inc.php', array(
154 ) );141 'content_mode' => 'auto',
155 // ----------------------------END ITEM BLOCK ----------------------------142 'image_size' => 'fit-400x320',
156 } // ---------------------------------- END OF POSTS ------------------------------------143 ) );
157 ?>144}
158145
159 <?php146// -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
160 // -------------------- PREV/NEXT PAGE LINKS (POST LIST MODE) --------------------
161 mainlist_page_links( array(147 mainlist_page_links( array(
162 'block_start' => '<p class="center">',148 'block_start' => '<p class="center">',
163 'block_end' => '</p>',149 'block_end' => '</p>',
@@ -165,26 +151,25 @@
165 'next_text' => '&gt;&gt;',151 'next_text' => '&gt;&gt;',
166 ) );152 ) );
167 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------153 // ------------------------- END OF PREV/NEXT PAGE LINKS -------------------------
168 ?>154
169155// --- --- --- --- --- --- --- --- --- --- ---
170156// MAIN CONTENT INCLUDED HERE
171 <?php157template_include( '$disp$', array(
172 // -------------- MAIN CONTENT TEMPLATE INCLUDED HERE (Based on $disp) --------------158 // we already handled these cases above
173 template_include( '$disp$', array(159 'disp_posts' => '',
174 'disp_posts' => '', // We already handled this case above160 'disp_single' => '',
175 'disp_single' => '', // We already handled this case above161 'disp_page' => '',
176 'disp_page' => '', // We already handled this case above162) );
177 ) );163?>
178 // Note: you can customize any of the sub templates included here by164</div>
179 // copying the matching php file into your template directory.165
180 // ------------------------- END OF MAIN CONTENT TEMPLATE ---------------------------166</div>
181 ?>167
182</div><!-- END text -->
183</div><!-- END leftside -->
184<div class="rightside">168<div class="rightside">
185 <div id="sidebar">169
186 <ul>170<div id="sidebar">
187 <?php171<ul>
172<?php
188 // ------------------- PREV/NEXT POST LINKS (SINGLE POST MODE) -------------------173 // ------------------- PREV/NEXT POST LINKS (SINGLE POST MODE) -------------------
189 item_prevnext_links( array(174 item_prevnext_links( array(
190 'block_start' => '<li class="prevnext">',175 'block_start' => '<li class="prevnext">',
@@ -256,19 +241,13 @@
256 ?>241 ?>
257242
258 <br/>Template by <a href="http://blog.thedarksighed.com/projectblog/" title="Custom template designs">design by Andrew Hreschak</a>243 <br/>Template by <a href="http://blog.thedarksighed.com/projectblog/" title="Custom template designs">design by Andrew Hreschak</a>
259244</p>
260 </p>245</div>
261246
262</div><!-- END pagefoot -->247</div>
263
264</div><!-- END wrap -->
265
266
267248
268<?php249<?php
269// ------------------------- HTML FOOTER INCLUDED HERE --------------------------250// --- --- --- --- --- --- --- --- --- --- ---
251// --- HTML FOOTER INCLUDED HERE ---
270template_include( '_html_footer.inc.php' );252template_include( '_html_footer.inc.php' );
271// Note: You can customize the default HTML footer by copying the
272// _html_footer.inc.php file into the current template folder.
273// ------------------------------- END OF FOOTER --------------------------------
274?>253?>
275\ No newline at end of file254\ No newline at end of file

Subscribers

People subscribed via source and target branches