[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[16622] branches/experimental/jquery

[<jon...@us...>]

Revision: 16622
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=16622&view=rev
Author:   jonnybradley
Date:     2009-02-09 14:14:32 +0000 (Mon, 09 Feb 2009)

Log Message:
-----------
[MRG] Automatic merge, trunk 16617 to 16621

Modified Paths:
--------------
    branches/experimental/jquery/lib/setup/prefs.php
    branches/experimental/jquery/templates/tiki-list_blogs.tpl

Added Paths:
-----------
    branches/experimental/jquery/img/tiki/tiki3.png

Property Changed:
----------------
    branches/experimental/jquery/
    branches/experimental/jquery/installer/schema/20081105_calendar_items_allday_update_tiki.sql
    branches/experimental/jquery/installer/schema/20090120_lost_2.0to3.0_tiki.sql
    branches/experimental/jquery/lib/core/lib/Multilingual/Aligner/BilingualAligner.php
    branches/experimental/jquery/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
    branches/experimental/jquery/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php
    branches/experimental/jquery/lib/core/test/Multilingual/Aligner/AllTests.php
    branches/experimental/jquery/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php
    branches/experimental/jquery/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php
    branches/experimental/jquery/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php
    branches/experimental/jquery/lib/wiki-plugins/wikiplugin_mediaplayer.php


Property changes on: branches/experimental/jquery
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/experimental/declfilter:15787-16031
/trunk:16288-16617
   + /branches/experimental/declfilter:15787-16031
/trunk:16288-16621

Copied: branches/experimental/jquery/img/tiki/tiki3.png (from rev 16621, trunk/img/tiki/tiki3.png)
===================================================================
(Binary files differ)


Property changes on: branches/experimental/jquery/installer/schema/20081105_calendar_items_allday_update_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/experimental/declfilter/installer/schema/20081105_calendar_items_allday_update.sql:15787-16031
/trunk/installer/schema/20081105_calendar_items_allday_update_tiki.sql:16288-16617
   + /branches/experimental/declfilter/installer/schema/20081105_calendar_items_allday_update.sql:15787-16031
/trunk/installer/schema/20081105_calendar_items_allday_update_tiki.sql:16288-16621


Property changes on: branches/experimental/jquery/installer/schema/20090120_lost_2.0to3.0_tiki.sql
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/installer/schema/20090120_lost_2.0to3.0_tiki.sql:16363-16617
   + /trunk/installer/schema/20090120_lost_2.0to3.0_tiki.sql:16363-16621


Property changes on: branches/experimental/jquery/lib/core/lib/Multilingual/Aligner/BilingualAligner.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16288-16617
   + /branches/experimental/declfilter/lib/multilingual/BilingualAligner.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/BilingualAligner.php:16288-16621


Property changes on: branches/experimental/jquery/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16288-16617
   + /branches/experimental/declfilter/lib/multilingual/SentenceSegmentor.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/SentenceSegmentor.php:16288-16621


Property changes on: branches/experimental/jquery/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16288-16617
   + /branches/experimental/declfilter/lib/multilingual/ShortestPathFinder.php:15787-16031
/trunk/lib/core/lib/Multilingual/Aligner/ShortestPathFinder.php:16288-16621


Property changes on: branches/experimental/jquery/lib/core/test/Multilingual/Aligner/AllTests.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/experimental/declfilter/lib/multilingual/AllTests.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/AllTests.php:16288-16617
   + /branches/experimental/declfilter/lib/multilingual/AllTests.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/AllTests.php:16288-16621


Property changes on: branches/experimental/jquery/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/experimental/declfilter/lib/multilingual/BilingualAlignerTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:16288-16617
   + /branches/experimental/declfilter/lib/multilingual/BilingualAlignerTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/BilingualAlignerTest.php:16288-16621


Property changes on: branches/experimental/jquery/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/experimental/declfilter/lib/multilingual/SentenceSegmentorTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:16288-16617
   + /branches/experimental/declfilter/lib/multilingual/SentenceSegmentorTest.php:15787-16031
/trunk/lib/core/test/Multilingual/Aligner/SentenceSegmentorTest.php:16288-16621


Property changes on: branches/experimental/jquery/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:16288-16617
   + /trunk/lib/core/test/Multilingual/Aligner/ShortestPathFinderTest.php:16288-16621

Modified: branches/experimental/jquery/lib/setup/prefs.php
===================================================================
--- branches/experimental/jquery/lib/setup/prefs.php	2009-02-09 10:06:14 UTC (rev 16621)
+++ branches/experimental/jquery/lib/setup/prefs.php	2009-02-09 14:14:32 UTC (rev 16622)
@@ -868,11 +868,11 @@
 		'sitemycode' => '<div align="center"><b>{tr}Here you can (as an admin) place a piece of custom XHTML and/or Smarty code. Be careful and properly close all the tags before you choose to publish ! (Javascript, applets and object tags are stripped out.){/tr}</b></div>', // must be max. 250 chars now unless it'll change in tiki_prefs db table field value from VARCHAR(250) to BLOB by default
 		'sitemycode_publish' => 'n',
 		'feature_sitelogo' => 'y',
-		'sitelogo_bgcolor' => '#FFF',
+		'sitelogo_bgcolor' => 'transparent',
 		'sitelogo_bgstyle' => '',
 		'sitelogo_align' => 'left',
 		'sitelogo_title' => 'Tikiwiki powered site',
-		'sitelogo_src' => 'img/tiki/tikilogo.png',
+		'sitelogo_src' => 'img/tiki/tiki3.png',
 		'sitelogo_alt' => 'Site Logo',
 		'feature_siteloc' => 'y',
 		'feature_sitenav' => 'n',
@@ -933,7 +933,7 @@
 		'feature_actionlog_bytes' => 'n',
 
 		// admin
-		'siteTitle' => 'Tiki 3.x',
+		'siteTitle' => 'Tiki 3.0',
 		'tmpDir' => 'temp',
 
 		// tell a friend


Property changes on: branches/experimental/jquery/lib/wiki-plugins/wikiplugin_mediaplayer.php
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:16488-16617
   + /trunk/lib/wiki-plugins/wikiplugin_mediaplayer.php:16488-16621

Modified: branches/experimental/jquery/templates/tiki-list_blogs.tpl
===================================================================
--- branches/experimental/jquery/templates/tiki-list_blogs.tpl	2009-02-09 10:06:14 UTC (rev 16621)
+++ branches/experimental/jquery/templates/tiki-list_blogs.tpl	2009-02-09 14:14:32 UTC (rev 16622)
@@ -14,12 +14,9 @@
 
 <table class="normal">
 <tr>
-{if $prefs.blog_list_title eq 'y'}
-	<th><a href="tiki-list_blogs.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'title_desc'}title_asc{else}title_desc{/if}">{tr}Title{/tr}</a></th>
+{if $prefs.blog_list_title eq 'y' or $prefs.blog_list_description eq 'y'}
+	<th><a href="tiki-list_blogs.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'title_desc'}title_asc{else}title_desc{/if}">{tr}Blog{/tr}</a></th>
 {/if}
-{if $prefs.blog_list_description eq 'y'}
-	<th>{tr}Description{/tr}</th>
-{/if}
 {if $prefs.blog_list_created eq 'y'}
 	<th><a href="tiki-list_blogs.php?offset={$offset}&amp;sort_mode={if $sort_mode eq 'created_desc'}created_asc{else}created_desc{/if}">{tr}Created{/tr}</a></th>
 {/if}
@@ -40,15 +37,28 @@
 {/if}
 <th>{tr}Action{/tr}</th>
 </tr>
+
 {cycle values="odd,even" print=false}
 {section name=changes loop=$listpages}
 <tr>
-{if $prefs.blog_list_title eq 'y'}
-	<td class="{cycle advance=false}">{if ($tiki_p_admin eq 'y') or ($listpages[changes].individual eq 'n') or ($listpages[changes].individual_tiki_p_read_blog eq 'y' ) }<a class="blogname" href="{$listpages[changes].blogId|sefurl:blog}" title="{$listpages[changes].title}">{/if}{if $listpages[changes].title}{$listpages[changes].title|truncate:$prefs.blog_list_title_len:"...":true}{else}&nbsp;{/if}{if ($tiki_p_admin eq 'y') or ($listpages[changes].individual eq 'n') or ($listpages[changes].individual_tiki_p_read_blog eq 'y' ) }</a>{/if}</td>
+{if $prefs.blog_list_title eq 'y' or $prefs.blog_list_description eq 'y'}
+	<td class="{cycle advance=false}">
+		{if ($tiki_p_admin eq 'y') or ($listpages[changes].individual eq 'n') or ($listpages[changes].individual_tiki_p_read_blog eq 'y' ) }
+			<a class="blogname" href="{$listpages[changes].blogId|sefurl:blog}" title="{$listpages[changes].title}">
+		{/if}
+		{if $listpages[changes].title}
+			{$listpages[changes].title|truncate:$prefs.blog_list_title_len:"...":true}
+		{else}
+			&nbsp;
+		{/if}
+		{if ($tiki_p_admin eq 'y') or ($listpages[changes].individual eq 'n') or ($listpages[changes].individual_tiki_p_read_blog eq 'y' ) }
+			</a>
+		{/if}
+		{if $prefs.blog_list_description eq 'y'}
+			<div class="subcomment">{$listpages[changes].description}</div>
+		{/if}
+	</td>
 {/if}
-{if $prefs.blog_list_description eq 'y'}
-	<td class="{cycle advance=false}">{$listpages[changes].description}</td>
-{/if}
 {if $prefs.blog_list_created eq 'y'}
 	<td class="{cycle advance=false}">&nbsp;{$listpages[changes].created|tiki_short_date}&nbsp;</td><!--tiki_date_format:"%b %d" -->
 {/if}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.