Re: BitKeeper patch

Marcel van der Boom <[email protected]> Wed, 16 Jul 2003 07:53:03 +0200
Newsgroups	gmane.comp.cms.xaraya.patches
Organization	HS-Development BV
Message-ID	<[email protected]>
This patch seem to be corrupted, could you send it again John (either here
or to me directly [email protected] )

thx

marcel

On Sunday 13 July 2003 21:35, Jonn Beames wrote:

> This BitKeeper patch contains the following changesets:
> jbeames@jbeames01.(none)|ChangeSet|20030713184403|18587
> 
> # ID: [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
> # User:       jbeames
> # Host:       jbeames01.(none)
> # Root:       /home/jbeames/projects/xaraya-stable
> 
> # Patch vers: 1.3
> # Patch type: REGULAR
> 
> == ChangeSet ==
> [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
> Vassilis@server.|ChangeSet|20030713150507|17962
> D 1.1208 03/07/13 11:44:03-07:00 jbeames@jbeames01.(none) +5 -0
> B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
> C
> c Category filter bug fix.  General formatting cleanup.
> K 18587
> P ChangeSet
> ------------------------------------------------
> 
> 0a0
>>
[email protected]|html/modules/articles/xarblocks/featureditems.php|20030620180147|29087|2cc0ac1f
>>
jbeames@jbeames01.(none)|html/modules/articles/xarblocks/featureditems.php|20030713184120|06214
>>
[email protected]|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030620180147|09167|2ccc3f67
>>
jbeames@jbeames01.(none)|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030713184120|40904
>>
[email protected]|html/modules/articles/xartemplates/blocks/featureditems.xd|20030620180147|01225|2cca96ef
>>
jbeames@jbeames01.(none)|html/modules/articles/xartemplates/blocks/featureditems.xd|20030713184120|17513
>>
[email protected]|BitKeeper/etc/ignore|20020928131446|21304|8879663d36cadc1
>> jbeames@jbeames01.(none)|BitKeeper/etc/ignore|20030713184120|17929
>>
[email protected]|BitKeeper/etc/logging_ok|20020928132559|02556|36872ac13653ac68
>> jbeames@jbeames01.(none)|BitKeeper/etc/logging_ok|20030713184347|18108
> 
> == html/modules/articles/xarblocks/featureditems.php ==
>
[email protected]|html/modules/articles/xarblocks/featureditems.php|20030620180147|29087|2cc0ac1f
>
John.Cox@mcnabb.|html/modules/articles/xarblocks/featureditems.php|20030704163344|21875
> D 1.5 03/07/13 11:41:20-07:00 jbeames@jbeames01.(none) +27 -23
> B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
> C
> c Fixed bug in category filter display in block update.  Plus general
> formate cleanup. K 6214
> O -rw-rw-rw-
> P html/modules/articles/xarblocks/featureditems.php
> ------------------------------------------------
> 
> D36 1
> I36 2
>                  'show_preview' => true
>                 );
> I83 1
> \
> D105 1
> I105 2
> \
>     if(($featuredaid)>0) {
> D110 2
> I111 1
>                                     );
> I112 1
> \
> D118 1
> I118 1
> \
> D191 1
> I191 1
>                                     );
> D222 1
> D245 1
> I245 1
>     }
> D249 1
> I249 1
>     }
> I260 1
> \
> I263 1
> \
> I268 1
> \
> I269 1
> \
> D288 3
> I290 2
> \
>     $vars['categorylist'] = xarModAPIFunc('categories','user','getcat');
> D293 5
> I297 6
>                                          'name' => xarML('All
>                                          Published')),
>                                    array('id' => '3',
>                                          'name' => xarML('Frontpage')),
>                                    array('id' => '2',
>                                          'name' => xarML('Approved'))
>                                   );
> D304 1
> I304 2
>                                        'name' => xarML('Date'))
>                                 );
> D310 2
> D320 1
> D329 1
> I329 1
>     //MikeC: Make sure we retrieve the new pubtype from the configuration
>     form.
> D333 1
> I333 1
>          $vars['itemlimit'],
> 
> == html/modules/articles/xartemplates/blocks/featureditems.xd ==
>
[email protected]|html/modules/articles/xartemplates/blocks/featureditems.xd|20030620180147|01225|2cca96ef
>
[email protected]|html/modules/articles/xartemplates/blocks/featureditems.xd|20030705150854|12566
> D 1.3 03/07/13 11:41:20-07:00 jbeames@jbeames01.(none) +29 -29
> B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
> C
> c Format cleanup.
> K 17513
> O -rw-rw-rw-
> P html/modules/articles/xartemplates/blocks/featureditems.xd
> ------------------------------------------------
> 
> D2 5
> I6 11
>     <xar:if condition="!empty($item['featuredlabel'])">
>         <xar:if condition="!empty($item['alttitle'])">
>             <a href="#$item['featuredlink']#">#$item['alttitle']#</a>
>         <xar:else />
>             <a href="#$item['featuredlink']#">#$item['featuredlabel']#</a>
>         </xar:if>
>         <br />
>         <xar:if condition="!empty($item['featureddesc'])">
>             #$item['featureddesc']#
>             <br />
>         </xar:if>
> D8 6
> D16 18
> I33 18
>     <BR />
>     <div CLASS="xar-block-title"><xar:mlstring>More Featured
>     Headlines</xar:mlstring>:</div> <xar:foreach in="$items"
>     value="$item">
>         &bull;
>         <xar:if condition="empty($item['link'])">
>             #$item['label']#
>         <xar:else />
>             <a href="#$item['link']#">#$item['label']#</a>
>         </xar:if>
>         <xar:if condition="!empty($item['count'])">
>             (#$item['count']#)
>         </xar:if>
>         <br />
>         <xar:if condition="!empty($item['desc'])">
>             #$item['desc']#
>             <br />
>         </xar:if>
>     </xar:foreach>
> 
> == html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd ==
>
[email protected]|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030620180147|09167|2ccc3f67
>
[email protected]|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030705150854|29774
> D 1.4 03/07/13 11:41:20-07:00 jbeames@jbeames01.(none) +37 -37
> B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
> C
> c Fixed bug in category filter display.  Plus general formatting cleanup.
> K 40904
> O -rw-rw-rw-
> P html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd
> ------------------------------------------------
> 
> D5 1
> I5 1
>                 <TD COLSPAN="5"><STRONG><xar:mlstring>Articles
>                 Filter</xar:mlstring></STRONG></TD>
> D16 2
> I17 2
>                     <option
>                     value="0"><xar:mlstring>All</xar:mlstring></option>
>                     <xar:foreach in="$pubtypes" key="$pubid"
>                     value="$pubtype">
> D19 6
> I24 6
>                             <option value="#$pubid#"
>                            
selected="selected">#$pubtype['descr']#</option>
>                         <xar:else />
>                             <option
>                             value="#$pubid#">#$pubtype['descr']#</option>
>                         </xar:if>
>                     </xar:foreach>
>                 </select></td>
> D26 9
> I34 9
>                     <option
>                     value="0"><xar:mlstring>All</xar:mlstring></option>
>                     <xar:foreach in="$categorylist" value="$catlistx">
>                         <xar:if condition="!empty($catfilter) and
>                         $catfilter eq $catlistx['cid']">
>                             <option value="#$catlistx['cid']#"
>                            
selected="selected">#$catlistx['name']#</option>
>                         <xar:else />
>                             <option
>                            
value="#$catlistx['cid']#">#$catlistx['name']#</option>
>                         </xar:if>
>                     </xar:foreach>
>                 </select></td>
> D36 12
> I47 12
>                     <xar:foreach in="$statusoptions"
>                     value="$statusoption">
>                         <xar:if condition="!empty($status) and $status eq
>                         $statusoption['id']">
>                             <option value="#$statusoption['id']#"
>                            
selected="selected">#$statusoption['name']#</option>
>                         <xar:else />
>                             <option
>                            
value="#$statusoption['id']#">#$statusoption['name']#</option>
>                         </xar:if>
>                     </xar:foreach>
>                 </select></td>
>                 <td><input type="text" name="itemlimit" id="itemlimit"
>                 value="#$itemlimit#" size="3" maxlength="4" /></td>
>                 <TD><input type="submit" value="Update" align="middle"
>                 /></TD>
>             </TR>
>         </TABLE>
> D56 1
> I56 1
>             <OPTION VALUE="" SELECTED="selected">--- choose an article to
>             be featured ---</OPTION>
> D59 5
> I63 5
>             <xar:if condition="$featuredaid eq $filtereditem['aid']">
>                 <option value="#$filtereditem['aid']#"
>                 selected="selected">#$filtereditem['title']#</option>
>             <xar:else />
>                 <option
>                
value="#$filtereditem['aid']#">#$filtereditem['title']#</option>
>             </xar:if>
> D87 1
> I87 1
>                     <option name="aid" value="#$item['aid']#"
>                     #$item['selected']#>#$item['title']#</option>
> 
> == BitKeeper/etc/ignore ==
>
[email protected]|BitKeeper/etc/ignore|20020928131446|21304|8879663d36cadc1
> marcel@ohm.|BitKeeper/etc/ignore|20030710164407|35418
> D 1.67 03/07/13 11:41:20-07:00 jbeames@jbeames01.(none) +164 -0
> B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
> C
> c Added html/themes/CHSF/blocks/bottomnav.xt
> html/themes/CHSF/blocks/center.xt html/themes/CHSF/blocks/default.xt
> html/themes/CHSF/blocks/frontleft.xt html/themes/CHSF/blocks/frontright.xt
> html/themes/CHSF/blocks/header.xt html/themes/CHSF/blocks/left.xt
> html/themes/CHSF/blocks/r-image.xt html/themes/CHSF/blocks/right.xt
> html/themes/CHSF/blocks/top.xt html/themes/CHSF/blocks/topnav.xt
> html/themes/CHSF/images/CHSF_logo_20.gif html/themes/CHSF/images/arrow.gif
> html/themes/CHSF/images/arrow2.gif html/themes/CHSF/images/bg-bottom.gif
> html/themes/CHSF/images/bg-top-nt.gif html/themes/CHSF/images/bg-top.gif
> html/themes/CHSF/images/bottom-left.gif
> html/themes/CHSF/images/bottom-right.gif
> html/themes/CHSF/images/bottom-row.gif
> html/themes/CHSF/images/boxcorner.gif html/themes/CHSF/images/btnline.gif
> html/themes/CHSF/images/chsfissuenav/30.gif
> html/themes/CHSF/images/chsfissuenav/30_hover.gif
> html/themes/CHSF/images/chsfissuenav/31.gif
> html/themes/CHSF/images/chsfissuenav/31_hover.gi! f
> html/themes/CHSF/images/chsfis K 17929 O -rw-rw-r-- P BitKeeper/etc/ignore
> ------------------------------------------------
> 
> I80 164
> html/themes/CHSF/blocks/bottomnav.xt
> html/themes/CHSF/blocks/center.xt
> html/themes/CHSF/blocks/default.xt
> html/themes/CHSF/blocks/frontleft.xt
> html/themes/CHSF/blocks/frontright.xt
> html/themes/CHSF/blocks/header.xt
> html/themes/CHSF/blocks/left.xt
> html/themes/CHSF/blocks/r-image.xt
> html/themes/CHSF/blocks/right.xt
> html/themes/CHSF/blocks/top.xt
> html/themes/CHSF/blocks/topnav.xt
> html/themes/CHSF/images/CHSF_logo_20.gif
> html/themes/CHSF/images/arrow.gif
> html/themes/CHSF/images/arrow2.gif
> html/themes/CHSF/images/bg-bottom.gif
> html/themes/CHSF/images/bg-top-nt.gif
> html/themes/CHSF/images/bg-top.gif
> html/themes/CHSF/images/bottom-left.gif
> html/themes/CHSF/images/bottom-right.gif
> html/themes/CHSF/images/bottom-row.gif
> html/themes/CHSF/images/boxcorner.gif
> html/themes/CHSF/images/btnline.gif
> html/themes/CHSF/images/chsfissuenav/30.gif
> html/themes/CHSF/images/chsfissuenav/30_hover.gif
> html/themes/CHSF/images/chsfissuenav/31.gif
> html/themes/CHSF/images/chsfissuenav/31_hover.gif
> html/themes/CHSF/images/chsfissuenav/32.gif
> html/themes/CHSF/images/chsfissuenav/32_hover.gif
> html/themes/CHSF/images/chsfissuenav/33.gif
> html/themes/CHSF/images/chsfissuenav/33_hover.gif
> html/themes/CHSF/images/dot.gif
> html/themes/CHSF/images/header_fill.gif
> html/themes/CHSF/images/header_logo2.gif
> html/themes/CHSF/images/homelessness.gif
> html/themes/CHSF/images/horizontal_line.gif
> html/themes/CHSF/images/img1_homeless.jpg
> html/themes/CHSF/images/img2_poverty.jpg
> html/themes/CHSF/images/img3_substance.jpg
> html/themes/CHSF/images/img4_ld.jpg
> html/themes/CHSF/images/left_img_bottom.jpg
> html/themes/CHSF/images/logo.gif
> html/themes/CHSF/images/mainNav_1.gif
> html/themes/CHSF/images/mainNav_1_hover.gif
> html/themes/CHSF/images/mainNav_2.gif
> html/themes/CHSF/images/mainNav_2_hover.gif
> html/themes/CHSF/images/mainNav_3.gif
> html/themes/CHSF/images/mainNav_3_hover.gif
> html/themes/CHSF/images/mainNav_4.gif
> html/themes/CHSF/images/mainNav_4_hover.gif
> html/themes/CHSF/images/right_img.jpg
> html/themes/CHSF/images/s-bottom-left.gif
> html/themes/CHSF/images/s-bottom-right.gif
> html/themes/CHSF/images/s-search.gif
> html/themes/CHSF/images/s-tagline.gif
> html/themes/CHSF/images/s-top-left.gif
> html/themes/CHSF/images/s-top-right.gif
> html/themes/CHSF/images/search.gif
> html/themes/CHSF/images/sh_line.gif
> html/themes/CHSF/images/shadow.gif
> html/themes/CHSF/images/side_all.gif
> html/themes/CHSF/images/sideline.gif
> html/themes/CHSF/images/tagline.gif
> html/themes/CHSF/images/top-left.gif
> html/themes/CHSF/images/top-right.gif
> html/themes/CHSF/images/topNav_line_20.gif
> html/themes/CHSF/images/vertical_line.gif
> html/themes/CHSF/images/vline.gif
> html/themes/CHSF/images/xaraya_logo.jpg
> html/themes/CHSF/js/base.js
> html/themes/CHSF/modules/articles/#user-display-news.xt#
> html/themes/CHSF/modules/articles/blocks/featureditems.xt
> html/themes/CHSF/modules/articles/default.xt
> html/themes/CHSF/modules/articles/includes/publinks.xt
> html/themes/CHSF/modules/articles/user-display-basic.xt
> html/themes/CHSF/modules/articles/user-display-news.bu.xt
> html/themes/CHSF/modules/articles/user-display-news.xt
> html/themes/CHSF/modules/articles/user-display.xt
> html/themes/CHSF/modules/articles/user-summary-basic.xt
> html/themes/CHSF/modules/articles/user-summary-news.xt
> html/themes/CHSF/modules/articles/user-summary.xt
> html/themes/CHSF/modules/articles/user-view.xt
> html/themes/CHSF/modules/articles/user-viewmap.xt
> html/themes/CHSF/modules/base/user-main.xt
> html/themes/CHSF/modules/categories/blocks/nav-prevnext.xt
> html/themes/CHSF/modules/categories/blocks/nav-rootcats.xt
> html/themes/CHSF/modules/categories/blocks/nav-trails.xt
> html/themes/CHSF/modules/categories/blocks/nav-tree.xt
> html/themes/CHSF/modules/categories/images/AllTopics.gif
> html/themes/CHSF/modules/categories/user-navigation-rootcats.xt
> html/themes/CHSF/modules/categories/user-navigation-trails.xt
> html/themes/CHSF/modules/categories/user-navigation-tree.xt
> html/themes/CHSF/modules/example/user-main.xt
> html/themes/CHSF/modules/roles/blocks/login.xt
> html/themes/CHSF/modules/roles/blocks/logout.xt
> html/themes/CHSF/modules/roles/images/blank.gif
> html/themes/CHSF/modules/search/blocks/search.xt
> html/themes/CHSF/pages/admin.xt
> html/themes/CHSF/pages/base.xt
> html/themes/CHSF/pages/default.xt
> html/themes/CHSF/style/style.css
> html/themes/CHSF/xartheme.php
> html/themes/Xavier/blocks/bottomnav.xt
> html/themes/Xavier/blocks/center.xt
> html/themes/Xavier/blocks/default.xt
> html/themes/Xavier/blocks/header.xt
> html/themes/Xavier/blocks/right.xt
> html/themes/Xavier/blocks/top.xt
> html/themes/Xavier/blocks/topnav.xt
> html/themes/Xavier/images/administration_header.gif
> html/themes/Xavier/images/btnline.gif
> html/themes/Xavier/images/dot.gif
> html/themes/Xavier/images/header_fill.gif
> html/themes/Xavier/images/header_logo.gif
> html/themes/Xavier/images/header_logo1.gif
> html/themes/Xavier/images/header_logo2.gif
> html/themes/Xavier/images/sh_line.gif
> html/themes/Xavier/images/side_all.gif
> html/themes/Xavier/images/sideline.gif
> html/themes/Xavier/images/vline.gif
> html/themes/Xavier/images/xaraya_logo.jpg
> html/themes/Xavier/images/xavier-2.gif
> html/themes/Xavier/images/xavier-logo.gif
> html/themes/Xavier/modules/articles/includes/publinks.xt
> html/themes/Xavier/modules/articles/user-display-news.xt
> html/themes/Xavier/modules/articles/user-summary-news.xt
> html/themes/Xavier/modules/categories/user-navigation-trails.xt
> html/themes/Xavier/modules/example/user-main.xt
> html/themes/Xavier/pages/admin.xt.bu
> html/themes/Xavier/pages/default.xt
> html/themes/Xavier/style/style.css
> html/themes/Xavier/xartheme.php
> html/themes/Xnash1/blocks/bottomnav.xt
> html/themes/Xnash1/blocks/center.xt
> html/themes/Xnash1/blocks/default.xt
> html/themes/Xnash1/blocks/header.xt
> html/themes/Xnash1/blocks/right.xt
> html/themes/Xnash1/blocks/top.xt
> html/themes/Xnash1/blocks/topnav.xt
> html/themes/Xnash1/images/.xvpics/bar.jpg
> html/themes/Xnash1/images/.xvpics/search.gif
> html/themes/Xnash1/images/b-shadow.gif
> html/themes/Xnash1/images/bar.jpg
> html/themes/Xnash1/images/bc-left.gif
> html/themes/Xnash1/images/bcl-shadow.gif
> html/themes/Xnash1/images/bcr-shadow.gif
> html/themes/Xnash1/images/dot.gif
> html/themes/Xnash1/images/logo.gif
> html/themes/Xnash1/images/logo.jpg
> html/themes/Xnash1/images/main.jpg
> html/themes/Xnash1/images/r-shadow.gif
> html/themes/Xnash1/images/search.gif
> html/themes/Xnash1/images/top.gif
> html/themes/Xnash1/images/trc-shadow.gif
> html/themes/Xnash1/images/xavier-2.gif
> html/themes/Xnash1/images/xavier.gif
> html/themes/Xnash1/modules/base/user-main.xt
> html/themes/Xnash1/modules/categories/images/AllTopics.gif
> html/themes/Xnash1/modules/roles/images/blank.gif
> html/themes/Xnash1/pages/admin.xt
> html/themes/Xnash1/pages/base.xt
> html/themes/Xnash1/pages/default.bu.xt
> html/themes/Xnash1/pages/default.xt
> html/themes/Xnash1/style/style.css
> html/themes/Xnash1/xartheme.php
> 
> == BitKeeper/etc/logging_ok ==
>
[email protected]|BitKeeper/etc/logging_ok|20020928132559|02556|36872ac13653ac68
> nuncanada@h0ly.(none)|BitKeeper/etc/logging_ok|20030707102121|15924
> D 1.94 03/07/13 11:43:47-07:00 jbeames@jbeames01.(none) +1 -0
> B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a
> C
> c Logging to [email protected] accepted
> K 18108
> O -rw-rw-r--
> P BitKeeper/etc/logging_ok
> ------------------------------------------------
> 
> I40 1
> jbeames@jbeames01.(none)
> 
> # Patch checksum=b836f47c

-- 
Marcel van der Boom, HS-Development BV
Kwartiersedijk 14B, 4893 RE
Fijnaart, The Netherlands
T: +31-168-468822, F: +31-168-468823