BitKeeper patch
Jonn Beames <jbeames-bi+AKbBUZKY6gyzm1THtWbp2dZbC/[email protected]> Wed, 16 Jul 2003 00:09:52 -0700
| Newsgroups | gmane.comp.cms.xaraya.patches |
|---|---|
| Message-ID | <[email protected]> |
This BitKeeper patch contains the following changesets: jbeames@jbeames01.(none)|ChangeSet|20030716064507|08308 # ID: [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a # User: jbeames # Host: jbeames01.(none) # Root: /home/jbeames/projects/bktest/xaraya-stable # Patch vers: 1.3 # Patch type: REGULAR == ChangeSet == [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a [email protected]|ChangeSet|20030716055136|09028 D 1.1224 03/07/15 23:45:07-07:00 jbeames@jbeames01.(none) +3 -0 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Corrected a bug in display of categories as a filter option in admin modify view. Plus general code clean up. K 8308 P ChangeSet ------------------------------------------------ 0a0 > [email protected]|html/modules/articles/xartemplates/blocks/featureditems.xd|20030620180147|01225|2cca96ef jbeames@jbeames01.(none)|html/modules/articles/xartemplates/blocks/featureditems.xd|20030716064504|17513 > [email protected]|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030620180147|09167|2ccc3f67 jbeames@jbeames01.(none)|html/modules/articles/xartemplates/blocks/featureditemsAdmin.xd|20030716064504|40904 > [email protected]|html/modules/articles/xarblocks/featureditems.php|20030620180147|29087|2cc0ac1f jbeames@jbeames01.(none)|html/modules/articles/xarblocks/featureditems.php|20030716064504|06214 == 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/15 23:45:04-07:00 jbeames@jbeames01.(none) +27 -23 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Corrected a bug in display of categories as a filter option in admin modify view. Plus general code formatting clean up. 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/15 23:45:04-07:00 jbeames@jbeames01.(none) +29 -29 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c General code formatting clean up. 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"> • <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/15 23:45:04-07:00 jbeames@jbeames01.(none) +37 -37 B [email protected]|ChangeSet|20020928131446|19176|e333bc156eae828a C c Corrected a bug in display of categories as a filter option in admin modify view. Plus general code formatting clean up. 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> # Patch checksum=58afa1dc