[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[28141] trunk

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

Revision: 28141
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=28141&view=rev
Author:   jonnybradley
Date:     2010-07-26 18:19:20 +0000 (Mon, 26 Jul 2010)

Log Message:
-----------
[MRG] Automatic merge, branches/5.x 28130 to 28140

Modified Paths:
--------------
    trunk/lib/articles/artlib.php
    trunk/lib/setup/js_detect.php
    trunk/styles/layout/layout-reference.css
    trunk/styles/layout/layout.css
    trunk/tiki-setup.php

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28130
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/proposals/4.x:24005
   + /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28140
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/proposals/4.x:24005

Modified: trunk/lib/articles/artlib.php
===================================================================
--- trunk/lib/articles/artlib.php	2010-07-26 18:06:18 UTC (rev 28140)
+++ trunk/lib/articles/artlib.php	2010-07-26 18:19:20 UTC (rev 28141)
@@ -1170,7 +1170,7 @@
 
 		$fromSql .= ' inner join `tiki_article_types` on `tiki_articles`.`type` = `tiki_article_types`.`type` ';
 		
-		$query = "select `tiki_articles`.*,
+		$query = "select distinct `tiki_articles`.*,
 			`tiki_article_types`.`use_ratings`,
 			`tiki_article_types`.`show_pre_publ`,
 			`tiki_article_types`.`show_post_expire`,
@@ -1194,7 +1194,7 @@
 				$mid $mid2 order by " . $this->convertSortMode($sort_mode);
 
 		$result = $this->query($query, $bindvars, $maxRecords, $offset);
-		$query_cant = "select count(*) from `tiki_articles` $fromSql $mid $mid2";
+		$query_cant = "select distinct count(*) from `tiki_articles` $fromSql $mid $mid2";
 		$cant = $this->getOne($query_cant, $bindvars);
 		$ret = array();
 		while ($res = $result->fetchRow()) {

Modified: trunk/lib/setup/js_detect.php
===================================================================
--- trunk/lib/setup/js_detect.php	2010-07-26 18:06:18 UTC (rev 28140)
+++ trunk/lib/setup/js_detect.php	2010-07-26 18:19:20 UTC (rev 28141)
@@ -77,7 +77,7 @@
 jqueryTiki.tablesorter = '.($prefs['feature_jquery_tablesorter'] == 'y' ? 'true' : 'false') . ';
 jqueryTiki.colorbox = '.($prefs['feature_shadowbox'] == 'y' ? 'true' : 'false') . ';
 jqueryTiki.cboxCurrent = "{current} / {total}";
-jqueryTiki.sheet = '.($prefs['feature_jquery_sheet'] == 'y' ? 'true' : 'false') . ';
+jqueryTiki.sheet = '.($prefs['feature_sheet'] == 'y' && $prefs['feature_jquery_sheet'] == 'y' ? 'true' : 'false') . ';
 jqueryTiki.carousel = '.($prefs['feature_jquery_carousel'] == 'y' ? 'true' : 'false') . ';
 jqueryTiki.jqs5 = '.($prefs['feature_jquery_jqs5'] == 'y' ? 'true' : 'false') . ';
 jqueryTiki.validate = '.($prefs['feature_jquery_validation'] == 'y' ? 'true' : 'false') . ';

Modified: trunk/styles/layout/layout-reference.css
===================================================================
--- trunk/styles/layout/layout-reference.css	2010-07-26 18:06:18 UTC (rev 28140)
+++ trunk/styles/layout/layout-reference.css	2010-07-26 18:19:20 UTC (rev 28141)
@@ -2779,6 +2779,11 @@
 }
 
 /***** TikiSheets *****/
+
+.tiki_sheet table td { /* override .tabcontent table td */
+	padding: 0;
+}
+
 .plugin-desc {
 	padding: 5px;
 }

Modified: trunk/styles/layout/layout.css
===================================================================
--- trunk/styles/layout/layout.css	2010-07-26 18:06:18 UTC (rev 28140)
+++ trunk/styles/layout/layout.css	2010-07-26 18:19:20 UTC (rev 28141)
@@ -1828,6 +1828,10 @@
 /***** Messages *****/
 
 /***** TikiSheets *****/
+.tiki_sheet table td {
+	padding: 0;
+}
+
 .plugin-desc {
 	padding: 5px;
 }

Modified: trunk/tiki-setup.php
===================================================================
--- trunk/tiki-setup.php	2010-07-26 18:06:18 UTC (rev 28140)
+++ trunk/tiki-setup.php	2010-07-26 18:19:20 UTC (rev 28141)
@@ -230,7 +230,7 @@
 	if( $prefs['feature_jquery_reflection'] == 'y' ) {
 		$headerlib->add_jsfile( 'lib/jquery/reflection-jquery/js/reflection.js' );
 	}
-	if( $prefs['feature_jquery_sheet'] == 'y' ) {
+	if( $prefs['feature_sheet'] == 'y' && $prefs['feature_jquery_sheet'] == 'y' ) {
 		$headerlib->add_cssfile( 'lib/jquery/jquery.sheet/jquery.sheet.css' );
 		$headerlib->add_jsfile( 'lib/jquery/jquery.sheet/jquery.sheet.js' );
 		$headerlib->add_jsfile( 'lib/jquery/jquery.json-2.2.js' );


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