Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8965] XoopsModules/newsslider/trunk/newsslider
|
From: <ye...@us...> - 2012-02-13 20:23:48
|
Revision: 8965
http://xoops.svn.sourceforge.net/xoops/?rev=8965&view=rev
Author: yerres2
Date: 2012-02-13 20:23:41 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
adding 1.2rc version
Modified Paths:
--------------
XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php
XoopsModules/newsslider/trunk/newsslider/admin/index.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php
XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php
XoopsModules/newsslider/trunk/newsslider/changelog.txt
XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php
XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php
XoopsModules/newsslider/trunk/newsslider/readme.txt
XoopsModules/newsslider/trunk/newsslider/style.css
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_bxslider.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_feature.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_s3slider.html
XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_scrolling.html
XoopsModules/newsslider/trunk/newsslider/xoops_version.php
Modified: XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/admin/admin_header.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -11,6 +11,7 @@
include '../../../include/cp_header.php';
global $xoopsModule,$xoopsConfig;
+
include_once XOOPS_ROOT_PATH."/modules/".$xoopsModule->dirname()."/admin/functions.php";
$myts =& MyTextSanitizer::getInstance();
Modified: XoopsModules/newsslider/trunk/newsslider/admin/index.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/admin/index.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/admin/index.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -14,5 +14,5 @@
echo "<P>"._AM_NWS_INTRO."</P><br/>";
xoops_cp_footer();
-exit();
+
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_bxslider.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -56,10 +56,10 @@
}
if ($options[22] == 0) {
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
} else {
$topics = array_slice($options, 22);
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
}
unset($tmpstory);
if(count($stories)==0) return '';
@@ -113,6 +113,8 @@
$block['stories'][] = $news;
}
$block['lang_read_more']= _MB_NWS_READMORE;
+ global $xoTheme;
+ $xoTheme -> addStylesheet( 'modules/newsslider/bx_styles.css' );
return $block;
}
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_feature.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -47,13 +47,11 @@
if ($options[13] == 0) {
if ($options[0] > 5) { $options[0] = 4; }
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[4]);
- //$stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[4]);
+ $stories = $tmpstory->getAllPublished($options[0], 0, $restricted, 0, true, $options[4]);
} else {
$topics = array_slice($options, 13);
if ($options[0] > 5) { $options[0] = 4; }
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[4]);
- //$stories = $tmpstory->getAllPublished($options[0],0,$restricted,$topics,1, $options[4]);
+ $stories = $tmpstory->getAllPublished($options[0], 0, $restricted, $topics, true, $options[4]);
}
unset($tmpstory);
@@ -111,7 +109,19 @@
}
$block['stories'][] = $news;
}
+
$block['lang_read_more']= _MB_NWS_READMORE;
+ global $xoTheme;
+ $xoTheme -> addStylesheet( 'modules/newsslider/style.css' );
+ /*$jquery = ($options[8]==1) ? 1:0;
+ if ( $jquery ) {
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/newsslider/js/jquery.min.js')) {
+ if(isset($xoTheme) && is_object($xoTheme)) {
+ $xoTheme -> addScript('/modules/newsslider/js/jquery.min.js', array( 'type' => 'text/javascript' ) );
+ $xoTheme -> addScript('/modules/newsslider/js/jquery-ui.min.js', array( 'type' => 'text/javascript' ) );
+ }
+ }
+ }*/
return $block;
}
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_glider.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -56,10 +56,10 @@
}
if ($options[23] == 0) {
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[13]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[13]);
} else {
$topics = array_slice($options, 23);
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[13]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[13]);
}
unset($tmpstory);
if(count($stories)==0) return '';
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_s3slider.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -46,10 +46,10 @@
}
if ($options[13] == 0) {
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[4]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[4]);
} else {
$topics = array_slice($options, 13);
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[4]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[4]);
}
unset($tmpstory);
@@ -103,6 +103,16 @@
$block['stories'][] = $news;
}
$block['lang_read_more']= _MB_NWS_READMORE;
+ global $xoTheme;
+ $xoTheme -> addStylesheet( 'modules/newsslider/s3_style.css' );
+ /*$jquery = ($options[8]==1) ? 1:0;
+ if ( $jquery ) {
+ if (file_exists(XOOPS_ROOT_PATH . '/modules/newsslider/js/jquery.min.js')) {
+ if(isset($xoTheme) && is_object($xoTheme)) {
+ $xoTheme -> addScript('/modules/newsslider/js/jquery.min.js', array( 'type' => 'text/javascript' ) );
+ $xoTheme -> addScript('/modules/newsslider/js/s3Slider.js', array( 'type' => 'text/javascript' ) );
+ }}
+ }*/
return $block;
}
Modified: XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/blocks/news_scrolling.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -10,7 +10,6 @@
*/
if( ! defined( 'XOOPS_ROOT_PATH' ) ) die( 'XOOPS root path not defined' ) ;
-
function b_scrolling_news_show( $options ) {
global $xoopsDB, $xoopsUser;
$myts = & MyTextSanitizer :: getInstance();
@@ -50,10 +49,10 @@
}
if ($options[16] == 0) {
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,0,1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
} else {
$topics = array_slice($options, 16);
- $stories = $tmpstory->getRandomNews($options[0],0,$restricted,$topics, 1, $options[7]);
+ $stories = $tmpstory->getAllPublished($options[0],0,$restricted,0,1, $options[7]);
}
unset($tmpstory);
if(count($stories)==0) return '';
@@ -77,15 +76,17 @@
if ($options[10] > 0) {
$html = $story->nohtml() == 1 ? 0 : 1;
//$html = $options[11] == 1 ? 0 : 1;
+ $clearhtml = $options[8] == 1 ? 0 : 1;
$smiley = $options[12] == 1 ? 0 : 1;
$xcode = $options[13] == 1 ? 0 : 1;
$image = $options[14] == 1 ? 0 : 1;
$br = $options[15] == 1 ? 0 : 1;
//--- for News versions prior to 1.60
- //$news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[10]+3);
- //--- for news version 1.60+
- $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br ), $options[10]+3));
-
+ if ($module->getVar('version') <= 160) {
+ $news['teaser'] = xoops_substr($myts->displayTarea(strip_tags($story->hometext)), 0, $options[10]+3);
+ } else {
+ $news['teaser'] = news_truncate_tagsafe(strip_tags($myts->displayTarea($story->hometext, $html, $smiley, $xcode, $image, $br ), $options[10]+3));
+ }
if($infotips>0) {
$news['infotips'] = ' title="'.news_make_infotips($story->hometext()).'"';
} else {
@@ -150,7 +151,6 @@
//---
$form .= "<tr><td class='even'>"._MB_NWS_CHARS."</td><td class='odd'><input type='text' name='options[9]' value='".$options[9]."'/></td></tr>";
$form .= "<tr><td class='even'>"._MB_NWS_TEASER." </td><td class='odd'><input type='text' name='options[10]' value='".$options[10]."' /></td></tr>";
-
//---
$form .= "<tr><td class='even'> </td> <td class='odd'> </td></tr>";
//---
Modified: XoopsModules/newsslider/trunk/newsslider/changelog.txt
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/changelog.txt 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/changelog.txt 2012-02-13 20:23:41 UTC (rev 8965)
@@ -1,5 +1,14 @@
-version 1.2 beta rev II
+version 1.2 rc
===========
+- fixed issue with random news
+- fixed some style and template related issues
+
+version 1.2 beta rev II
+===========
+- fixed a variety of Bugs
+
+version 1.2 beta rev I
+===========
- Added S3slider
- Added bxSlider
Modified: XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/language/english/blocks.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -74,4 +74,7 @@
define("_MB_NWS_JUSTIFY", "Justify");
define("_MB_NWS_TOPICT", "Show Topics?");
define("_MB_NWS_CAPTIONS", "Show image captions?");
+// RC
+define("_MB_NWS_JQUERY", "Load jQuery ?<div style=\" font-size: smaller; align='left'\">If jQuery is already being loaded in the theme, you can disable it here.</div>");
+define("_MB_NWS_STRIPTAGS", "Clear HTML tags ?<div style=\" font-size: smaller; align='left'\">Check here whether HTML-tags shall be cleared out of the text.</div>");
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/language/german/blocks.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -74,4 +74,6 @@
define("_MB_NWS_JUSTIFY", "Blocksatz");
define("_MB_NWS_TOPICT", "Themen anzeigen?");
define("_MB_NWS_CAPTIONS", "Bild Untertitel anzeigen?");
+// RC
+define("_MB_NWS_JQUERY", "jQuery im Block Laden?<div style=\" font-size: smaller; align='left'\">Falls jQuery bereits im Theme geladen wird, braucht es nicht im Block geladen zu werden.</div>");
?>
\ No newline at end of file
Modified: XoopsModules/newsslider/trunk/newsslider/readme.txt
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/readme.txt 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/readme.txt 2012-02-13 20:23:41 UTC (rev 8965)
@@ -26,7 +26,6 @@
Five featured Images, named from image1.jpg to image5.jpg, have following dimensions: 410 x 300px.
.bxSlider (beta!)
Images are named in the same manner and are located in the same directory as for Featured Content Slider. They can be of any size.
-(edit:modified template because of incompability)
Credits and Thanks
@@ -36,7 +35,9 @@
Featured Content Slider : Web Developer Plus : http://webdeveloperplus.com/jquery/featured-content-slider-using-jquery-ui/
S3Slider : http://www.serie3.info/s3slider/
jQuery bxSlider v3.0 : http://bxslider.com/
-News Module : Hervet http://xoops.org/
+News Module : Herve http://xoops.org/
+Maitsco : http://www.maitsco.com/english
+jlmZone : http://www.jlmzone.com/modules/news/
BETA VERSION
Modified: XoopsModules/newsslider/trunk/newsslider/style.css
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/style.css 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/style.css 2012-02-13 20:23:41 UTC (rev 8965)
@@ -33,6 +33,7 @@
height:60px;
color:#333; background:#fff;
line-height:14px;
+ list-style:none;
}
#featured li.ui-tabs-nav-item a:hover{
background:#f2f2f2;
Modified: XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_bxslider.html
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_bxslider.html 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_bxslider.html 2012-02-13 20:23:41 UTC (rev 8965)
@@ -1,8 +1,6 @@
-
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.min.js"></script>
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.bxSlider.min.js"></script>
<{if $block.easing}><script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.easing.1.3.js"></script><{/if}>
-<link rel="stylesheet" href="<{$xoops_url}>/modules/newsslider/bx_styles.css" type="text/css" />
<{*
$block.mode == 0 - horizontal
$block.mode == 1 - vertical
Modified: XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_feature.html
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_feature.html 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_feature.html 2012-02-13 20:23:41 UTC (rev 8965)
@@ -1,6 +1,5 @@
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.min.js"></script>
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery-ui.min.js"></script>
-<link rel="stylesheet" href="<{$xoops_url}>/modules/newsslider/style.css" type="text/css" />
<script type="text/javascript">
$(document).ready(function(){
$("#featured").tabs({fx:{opacity: "toggle"}}).tabs("rotate", <{$block.speed}>000, true);
@@ -17,7 +16,7 @@
<div id="featured" >
<ul class="ui-tabs-nav">
-<{foreach item=news from=$block.stories}>
+<{foreach item=news from=$block.stories}>
<li class="ui-tabs-nav-item <{if $news.no == 0}>ui-tabs-selected<{/if}>" id="nav-fragment-<{$news.no}>"><a href="#fragment-<{$news.no}>"><img src="<{$xoops_url}>/modules/newsslider/images/<{$news.thumb}>" alt="<{$news.topic_title}> - <{$news.title}>" /><span><{$news.title}><br/> <{if $block.includedate}><span id="date"><{$news.date}></span><br /><{/if}></span><{if $block.author}><span id="date"><{$news.author}></span><{/if}></span></a></li>
<{/foreach}>
</ul>
@@ -26,7 +25,7 @@
<!-- <{$news.no}>. Content -->
<div id="fragment-<{$news.no}>" class="ui-tabs-panel<{if $news.no != 0}> ui-tabs-hide<{/if}>" style="">
<img src="<{$xoops_url}>/modules/newsslider/images/<{$news.picture}>" alt="<{$news.topic_title}> - <{$news.title}>" />
- <div class="info" >
+ <div class="info">
<h2><a href="<{$xoops_url}>/modules/news/article.php?storyid=<{$news.id}>" />
<{$news.title}></a></h2>
<p><{$news.teaser}> <a href="<{$xoops_url}>/modules/news/article.php?storyid=<{$news.id}>" ><{$smarty.const._MB_NWS_READMORE}></a></p>
Modified: XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_s3slider.html
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_s3slider.html 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_s3slider.html 2012-02-13 20:23:41 UTC (rev 8965)
@@ -1,6 +1,5 @@
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/jquery.min.js"></script>
<script type="text/javascript" src="<{$xoops_url}>/modules/newsslider/js/s3Slider.js"></script>
-<link rel="stylesheet" href="<{$xoops_url}>/modules/newsslider/s3_style.css" type="text/css" />
<script type="text/javascript">
$(document).ready(function() {
$('#slider').s3Slider({
Modified: XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_scrolling.html
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_scrolling.html 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/templates/blocks/news_scrolling.html 2012-02-13 20:23:41 UTC (rev 8965)
@@ -4,7 +4,7 @@
direction='<{$block.direction}>'
style='width:100%;height:160px;'
bgcolor='<{$block.bgcolor}>'
- scrollamount='<{$block.speed}>'
+ scrollamount='5'
scrolldelay='<{$block.speed}>'
<{if $block.alternate}>
behavior='alternate'
Modified: XoopsModules/newsslider/trunk/newsslider/xoops_version.php
===================================================================
--- XoopsModules/newsslider/trunk/newsslider/xoops_version.php 2012-02-13 19:57:06 UTC (rev 8964)
+++ XoopsModules/newsslider/trunk/newsslider/xoops_version.php 2012-02-13 20:23:41 UTC (rev 8965)
@@ -38,8 +38,8 @@
$modversion['license'] = "GPL see LICENSE";
$modversion["license_file"] = XOOPS_URL."/modules/newsslider/gpl.txt";
-$modversion["release"] = "2012-01-30";
-$modversion["module_status"] = "beta";
+$modversion["release"] = "2012-02-13";
+$modversion["module_status"] = "RC";
// Sql
// Admin things
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
