From: <pk...@us...> - 2009-05-20 06:57:05
|
Revision: 18929 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18929&view=rev Author: pkdille Date: 2009-05-20 06:56:51 +0000 (Wed, 20 May 2009) Log Message: ----------- [FIX] list_file_gallery: look fix only. Both tabs cannot be "active" when we arrive on that template Modified Paths: -------------- branches/proposed/templates/edit_file_gallery.tpl Modified: branches/proposed/templates/edit_file_gallery.tpl =================================================================== --- branches/proposed/templates/edit_file_gallery.tpl 2009-05-20 06:48:18 UTC (rev 18928) +++ branches/proposed/templates/edit_file_gallery.tpl 2009-05-20 06:56:51 UTC (rev 18929) @@ -12,7 +12,7 @@ <span style="float:right; margin-bottom: -1em"><input type="submit" value="{tr}Save{/tr}" name="edit" /> <input type="checkbox" name="viewitem" checked="checked"/> {tr}View inserted gallery{/tr}</span> <div class="tabs" style="clear: both;"> <span id="tab1" class="tabmark tabactive"><a href="javascript:tikitabs(1,3);">{tr}Properties{/tr}</a></span> - <span id="tab2" class="tabmark tabactive"><a href="javascript:tikitabs(2,3);">{tr}Display Properties{/tr}</a></span> + <span id="tab2" class="tabmark tabinactive"><a href="javascript:tikitabs(2,3);">{tr}Display Properties{/tr}</a></span> </div> {else} <div class="input_submit_container" style="text-align: right"><input type="submit" value="{tr}Save{/tr}" name="edit" /> <input type="checkbox" name="viewitem" checked="checked"/> {tr}View inserted gallery{/tr}</div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ny...@us...> - 2009-05-21 19:02:58
|
Revision: 18993 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18993&view=rev Author: nyloth Date: 2009-05-21 19:02:38 +0000 (Thu, 21 May 2009) Log Message: ----------- [bp/r18555][FIX] Displaying the parentName for a gallery in the parentName select. If there were 2 or more galleries with the same name the user couldn't knows which one to choose. [bp/r18991][FIX] edit file gallery: xhtml validation Modified Paths: -------------- branches/proposed/templates/edit_file_gallery.tpl Modified: branches/proposed/templates/edit_file_gallery.tpl =================================================================== --- branches/proposed/templates/edit_file_gallery.tpl 2009-05-21 18:58:53 UTC (rev 18992) +++ branches/proposed/templates/edit_file_gallery.tpl 2009-05-21 19:02:38 UTC (rev 18993) @@ -45,7 +45,7 @@ <option value="-1" {if $parentId == -1} selected="selected"{/if}>{tr}none{/tr}</option> {foreach from=$all_galleries key=key item=item} {if $galleryId neq $item.id} - <option value="{$item.id}" {if $parentId == $item.id} selected="selected"{/if}>{$item.name|escape}</option> + <option value="{$item.id}" {if $parentId == $item.id} selected="selected"{/if}>{if $item.parentName}{$item.parentName|escape} > {/if}{$item.name|escape}</option> {/if} {/foreach} </select> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: Jonny B. <tw...@no...> - 2009-05-29 14:38:37
|
+1 On 21 May 2009, at 20:02, ny...@us... wrote: > Revision: 18993 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18993&view=rev > Author: nyloth > Date: 2009-05-21 19:02:38 +0000 (Thu, 21 May 2009) > > Log Message: > ----------- > [bp/r18555][FIX] Displaying the parentName for a gallery in the > parentName select. If there were 2 or more galleries with the same > name the user couldn't knows which one to choose. > [bp/r18991][FIX] edit file gallery: xhtml validation > > Modified Paths: > -------------- > branches/proposed/templates/edit_file_gallery.tpl > > Modified: branches/proposed/templates/edit_file_gallery.tpl > =================================================================== > --- branches/proposed/templates/edit_file_gallery.tpl 2009-05-21 > 18:58:53 UTC (rev 18992) > +++ branches/proposed/templates/edit_file_gallery.tpl 2009-05-21 > 19:02:38 UTC (rev 18993) > @@ -45,7 +45,7 @@ > <option value="-1" {if $parentId == -1} > selected="selected"{/if}>{tr}none{/tr}</option> > {foreach from=$all_galleries key=key item=item} > {if $galleryId neq $item.id} > - <option value="{$item.id}" {if $parentId == $item.id} > selected="selected"{/if}>{$item.name|escape}</option> > + <option value="{$item.id}" {if $parentId == $item.id} > selected="selected"{/if}>{if $item.parentName}{$item.parentName| > escape} > {/if}{$item.name|escape}</option> > {/if} > {/foreach} > </select> > > > This was sent by the SourceForge.net collaborative development > platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT > is a gathering of tech-side developers & brand creativity > professionals. Meet > the minds behind Google Creative Lab, Visual Complexity, Processing, & > iPhoneDevCamp asthey present alongside digital heavyweights like > Barbarian > Group, R/GA, & Big Spaceship. http://www.creativitycat.com > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |
From: Nyloth <ny...@ti...> - 2009-06-13 00:58:12
|
Backported in 3.0 as revision 19471 Nyloth 2009/5/29 Jonny Bradley <tw...@no...> > +1 > > On 21 May 2009, at 20:02, ny...@us... wrote: > > > Revision: 18993 > > > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18993&view=rev > > Author: nyloth > > Date: 2009-05-21 19:02:38 +0000 (Thu, 21 May 2009) > > > > Log Message: > > ----------- > > [bp/r18555][FIX] Displaying the parentName for a gallery in the > > parentName select. If there were 2 or more galleries with the same > > name the user couldn't knows which one to choose. > > [bp/r18991][FIX] edit file gallery: xhtml validation > > > > Modified Paths: > > -------------- > > branches/proposed/templates/edit_file_gallery.tpl > > > > Modified: branches/proposed/templates/edit_file_gallery.tpl > > =================================================================== > > --- branches/proposed/templates/edit_file_gallery.tpl 2009-05-21 > > 18:58:53 UTC (rev 18992) > > +++ branches/proposed/templates/edit_file_gallery.tpl 2009-05-21 > > 19:02:38 UTC (rev 18993) > > @@ -45,7 +45,7 @@ > > <option value="-1" {if $parentId == -1} > > selected="selected"{/if}>{tr}none{/tr}</option> > > {foreach from=$all_galleries key=key item=item} > > {if $galleryId neq > $item.id} > > - <option value="{$item.id}" {if $parentId == $item.id} > > selected="selected"{/if}>{$item.name|escape}</option> > > + <option value="{$item.id}" {if $parentId == $item.id} > > selected="selected"{/if}>{if $item.parentName}{$item.parentName| > > escape} > {/if}{$item.name|escape}</option> > > {/if} > > {/foreach} > > </select> > > > > > > This was sent by the SourceForge.net collaborative development > > platform, the world's largest Open Source development site. > > > > > ------------------------------------------------------------------------------ > > Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT > > is a gathering of tech-side developers & brand creativity > > professionals. Meet > > the minds behind Google Creative Lab, Visual Complexity, Processing, & > > iPhoneDevCamp asthey present alongside digital heavyweights like > > Barbarian > > Group, R/GA, & Big Spaceship. http://www.creativitycat.com > > _______________________________________________ > > Tikiwiki-cvs mailing list > > Tik...@li... > > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > ------------------------------------------------------------------------------ > Register Now for Creativity and Technology (CaT), June 3rd, NYC. CaT > is a gathering of tech-side developers & brand creativity professionals. > Meet > the minds behind Google Creative Lab, Visual Complexity, Processing, & > iPhoneDevCamp as they present alongside digital heavyweights like Barbarian > Group, R/GA, & Big Spaceship. http://p.sf.net/sfu/creativitycat-com > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Nyloth <ny...@ti...> - 2009-05-20 08:02:43
|
OK for me Nyloth 2009/5/20 <pk...@us...> > Revision: 18929 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18929&view=rev > Author: pkdille > Date: 2009-05-20 06:56:51 +0000 (Wed, 20 May 2009) > > Log Message: > ----------- > [FIX] list_file_gallery: look fix only. Both tabs cannot be "active" when > we arrive on that template > > Modified Paths: > -------------- > branches/proposed/templates/edit_file_gallery.tpl > > Modified: branches/proposed/templates/edit_file_gallery.tpl > =================================================================== > --- branches/proposed/templates/edit_file_gallery.tpl 2009-05-20 06:48:18 > UTC (rev 18928) > +++ branches/proposed/templates/edit_file_gallery.tpl 2009-05-20 06:56:51 > UTC (rev 18929) > @@ -12,7 +12,7 @@ > <span style="float:right; margin-bottom: -1em"><input type="submit" > value="{tr}Save{/tr}" name="edit" /> <input type="checkbox" > name="viewitem" checked="checked"/> {tr}View inserted gallery{/tr}</span> > <div class="tabs" style="clear: both;"> > <span id="tab1" class="tabmark tabactive"><a > href="javascript:tikitabs(1,3);">{tr}Properties{/tr}</a></span> > - <span id="tab2" class="tabmark > tabactive"><a href="javascript:tikitabs(2,3);">{tr}Display > Properties{/tr}</a></span> > + <span id="tab2" class="tabmark > tabinactive"><a href="javascript:tikitabs(2,3);">{tr}Display > Properties{/tr}</a></span> > </div> > {else} > <div class="input_submit_container" style="text-align: right"><input > type="submit" value="{tr}Save{/tr}" name="edit" /> <input > type="checkbox" name="viewitem" checked="checked"/> {tr}View inserted > gallery{/tr}</div> > > > This was sent by the SourceForge.net collaborative development platform, > the world's largest Open Source development site. > > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > http://p.sf.net/sfu/businessobjects > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > |
From: Jonny B. <tw...@no...> - 2009-05-20 08:37:12
|
+1 On 20 May 2009, at 09:02, Nyloth wrote: > OK for me > > Nyloth > > 2009/5/20 <pk...@us...> > Revision: 18929 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18929&view=rev > Author: pkdille > Date: 2009-05-20 06:56:51 +0000 (Wed, 20 May 2009) > > Log Message: > ----------- > [FIX] list_file_gallery: look fix only. Both tabs cannot be "active" > when we arrive on that template > > Modified Paths: > -------------- > branches/proposed/templates/edit_file_gallery.tpl > > Modified: branches/proposed/templates/edit_file_gallery.tpl > =================================================================== > --- branches/proposed/templates/edit_file_gallery.tpl 2009-05-20 > 06:48:18 UTC (rev 18928) > +++ branches/proposed/templates/edit_file_gallery.tpl 2009-05-20 > 06:56:51 UTC (rev 18929) > @@ -12,7 +12,7 @@ > <span style="float:right; margin-bottom: -1em"><input > type="submit" value="{tr}Save{/tr}" name="edit" /> <input > type="checkbox" name="viewitem" checked="checked"/> {tr}View > inserted gallery{/tr}</span> > <div class="tabs" style="clear: both;"> > <span id="tab1" class="tabmark > tabactive"><a href="javascript:tikitabs(1,3);">{tr}Properties{/tr}</ > a></span> > - <span id="tab2" class="tabmark > tabactive"><a href="javascript:tikitabs(2,3);">{tr}Display > Properties{/tr}</a></span> > + <span id="tab2" class="tabmark > tabinactive"><a href="javascript:tikitabs(2,3);">{tr}Display > Properties{/tr}</a></span> > </div> > {else} > <div class="input_submit_container" style="text-align: > right"><input type="submit" value="{tr}Save{/tr}" name="edit" / > > <input type="checkbox" name="viewitem" checked="checked"/> > {tr}View inserted gallery{/tr}</div> > > > This was sent by the SourceForge.net collaborative development > platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > http://p.sf.net/sfu/businessobjects > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > http://p.sf.net/sfu/businessobjects_______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |
From: Nyloth <ny...@ti...> - 2009-05-20 17:12:35
|
Backported as revision 18950 Nyloth 2009/5/20 Jonny Bradley <tw...@no...> > +1 > > On 20 May 2009, at 09:02, Nyloth wrote: > > OK for me > > Nyloth > > 2009/5/20 <pk...@us...> > >> Revision: 18929 >> http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=18929&view=rev >> Author: pkdille >> Date: 2009-05-20 06:56:51 +0000 (Wed, 20 May 2009) >> >> Log Message: >> ----------- >> [FIX] list_file_gallery: look fix only. Both tabs cannot be "active" when >> we arrive on that template >> >> Modified Paths: >> -------------- >> branches/proposed/templates/edit_file_gallery.tpl >> >> Modified: branches/proposed/templates/edit_file_gallery.tpl >> =================================================================== >> --- branches/proposed/templates/edit_file_gallery.tpl 2009-05-20 >> 06:48:18 UTC (rev 18928) >> +++ branches/proposed/templates/edit_file_gallery.tpl 2009-05-20 >> 06:56:51 UTC (rev 18929) >> @@ -12,7 +12,7 @@ >> <span style="float:right; margin-bottom: -1em"><input type="submit" >> value="{tr}Save{/tr}" name="edit" /> <input type="checkbox" >> name="viewitem" checked="checked"/> {tr}View inserted gallery{/tr}</span> >> <div class="tabs" style="clear: both;"> >> <span id="tab1" class="tabmark >> tabactive"><a >> href="javascript:tikitabs(1,3);">{tr}Properties{/tr}</a></span> >> - <span id="tab2" class="tabmark >> tabactive"><a href="javascript:tikitabs(2,3);">{tr}Display >> Properties{/tr}</a></span> >> + <span id="tab2" class="tabmark >> tabinactive"><a href="javascript:tikitabs(2,3);">{tr}Display >> Properties{/tr}</a></span> >> </div> >> {else} >> <div class="input_submit_container" style="text-align: >> right"><input type="submit" value="{tr}Save{/tr}" name="edit" /> <input >> type="checkbox" name="viewitem" checked="checked"/> {tr}View inserted >> gallery{/tr}</div> >> >> >> This was sent by the SourceForge.net collaborative development platform, >> the world's largest Open Source development site. >> >> >> ------------------------------------------------------------------------------ >> Crystal Reports - New Free Runtime and 30 Day Trial >> Check out the new simplified licensing option that enables >> unlimited royalty-free distribution of the report engine >> for externally facing server and web deployment. >> http://p.sf.net/sfu/businessobjects >> _______________________________________________ >> Tikiwiki-cvs mailing list >> Tik...@li... >> https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs >> > > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > > http://p.sf.net/sfu/businessobjects_______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > > > > ------------------------------------------------------------------------------ > Crystal Reports - New Free Runtime and 30 Day Trial > Check out the new simplified licensing option that enables > unlimited royalty-free distribution of the report engine > for externally facing server and web deployment. > http://p.sf.net/sfu/businessobjects > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > |