From: Jonny B. <jo...@ti...> - 2011-01-29 17:15:56
|
+1 On 27 Jan 2011, at 13:27, Nyloth wrote: > +1 > > Thanx Chibaguy :-) > > Nyloth > > 2011/1/27 <chi...@us...> > Revision: 32188 > http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=32188&view=rev > Author: chibaguy > Date: 2011-01-27 11:59:57 +0000 (Thu, 27 Jan 2011) > > Log Message: > ----------- > [FIX] Rollback of r32158 to remove div from templates/tiki-searchbar.tpl, adding div to Coelesce's tiki-site_header_top.tpl file, and adjusting coelesce.css (so magnifying glass icon displays as before). > > Modified Paths: > -------------- > branches/proposals/6.x/styles/coelesce.css > branches/proposals/6.x/templates/styles/coelesce/tiki-site_header_top.tpl > branches/proposals/6.x/templates/tiki-sitesearchbar.tpl > > Modified: branches/proposals/6.x/styles/coelesce.css > =================================================================== > --- branches/proposals/6.x/styles/coelesce.css 2011-01-27 11:02:19 UTC (rev 32187) > +++ branches/proposals/6.x/styles/coelesce.css 2011-01-27 11:59:57 UTC (rev 32188) > @@ -327,7 +327,7 @@ > display: none; /*inline*/ > } > > -#sitesearchbar { > +.searchbar_wrapper { > float: right; > margin-top: 3px; > margin-right: 0; > @@ -339,7 +339,7 @@ > color: #517ea7; > } > > -#sitesearchbar .wrapper { > +#sitesearchbar { > background: url(coelesce/search_wide.jpg) 100% 0 no-repeat; > margin-right: 0; > margin-left: auto; > > Modified: branches/proposals/6.x/templates/styles/coelesce/tiki-site_header_top.tpl > =================================================================== > --- branches/proposals/6.x/templates/styles/coelesce/tiki-site_header_top.tpl 2011-01-27 11:02:19 UTC (rev 32187) > +++ branches/proposals/6.x/templates/styles/coelesce/tiki-site_header_top.tpl 2011-01-27 11:59:57 UTC (rev 32188) > @@ -3,8 +3,8 @@ > {include file='tiki-site_header_top_begin.tpl'} > {include file='tiki-secondary_sitemenu.tpl'} > <div id="login_search"> > - <div class="wrapper"> > - {include file='tiki-site_header_login.tpl'} > + {include file='tiki-site_header_login.tpl'} > + <div class="searchbar_wrapper"> > {include file='tiki-sitesearchbar.tpl'} > </div> > </div> > > Modified: branches/proposals/6.x/templates/tiki-sitesearchbar.tpl > =================================================================== > --- branches/proposals/6.x/templates/tiki-sitesearchbar.tpl 2011-01-27 11:02:19 UTC (rev 32187) > +++ branches/proposals/6.x/templates/tiki-sitesearchbar.tpl 2011-01-27 11:59:57 UTC (rev 32188) > @@ -4,7 +4,6 @@ > {if $prefs.feature_sitesearch eq 'y' and $tiki_p_search eq 'y'} > {if $prefs.feature_search eq 'y' or $prefs.feature_search_fulltext eq 'y'} > <div id="sitesearchbar"{if $prefs.feature_sitemycode neq 'y' and $prefs.feature_banners eq 'y' && $prefs.feature_sitelogo neq 'y' and ($prefs.feature_banners neq 'y' or $prefs.feature_sitead neq 'y') and $prefs.feature_fullscreen eq 'y' and $filegals_manager eq '' and $print_page ne 'y'}{if $smarty.session.fullscreen neq 'y'}style="margin-right: 80px"{/if}{/if}> > - <div class="wrapper"> > {if $prefs.feature_search_fulltext eq 'y'} > {include file='tiki-searchresults.tpl' > where=$prefs.search_default_where > @@ -20,7 +19,6 @@ > iSearch=2 > searchOrientation="horiz"} > {/if} > - </div> > </div> > {/if} > {/if} > > > This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d > _______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs > > ------------------------------------------------------------------------------ > Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)! > Finally, a world-class log management solution at an even better price-free! > Download using promo code Free_Logger_4_Dev2Dev. Offer expires > February 28th, so secure your free ArcSight Logger TODAY! > http://p.sf.net/sfu/arcsight-sfd2d_______________________________________________ > Tikiwiki-cvs mailing list > Tik...@li... > https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs |