Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12848] XoopsCore/branches/2.5.x/2.5.8/htdocs
|
From: <be...@us...> - 2014-11-16 10:46:41
|
Revision: 12848
http://sourceforge.net/p/xoops/svn/12848
Author: beckmi
Date: 2014-11-16 10:46:18 +0000 (Sun, 16 Nov 2014)
Log Message:
-----------
Adding Footer blocks (http://xoops.org/modules/newbb/viewtopic.php?topic_id=76816), updating xBootstrap
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/blocksadmin.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme.html
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/css/bootstrap.min.css
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/css/reset.css
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/docs/TODO.txt
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/docs/changelog.txt
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/docs/readme.txt
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/js/bootstrap.min.js
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/js/js.js
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/language/english/main.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/extgallery/extgallery_index.html
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/extgallery/extgallery_public-album.html
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/news/news_index.html
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/modules/tdmdownloads/tdmdownloads_index.html
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/style.css
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/theme.ini
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/tpl/content-zone.html
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php 2014-11-15 21:39:25 UTC (rev 12847)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php 2014-11-16 10:46:18 UTC (rev 12848)
@@ -102,7 +102,15 @@
XOOPS_CENTERBLOCK_RIGHT => 'page_topright' ,
XOOPS_CENTERBLOCK_BOTTOMLEFT => 'page_bottomleft' ,
XOOPS_CENTERBLOCK_BOTTOM => 'page_bottomcenter' ,
- XOOPS_CENTERBLOCK_BOTTOMRIGHT => 'page_bottomright');
+ XOOPS_CENTERBLOCK_BOTTOMRIGHT => 'page_bottomright',
+
+
+ XOOPS_FOOTERBLOCK_LEFT => 'footer_left',
+ XOOPS_FOOTERBLOCK_RIGHT => 'footer_center' ,
+ XOOPS_FOOTERBLOCK_CENTER => 'footer_right' ,
+ XOOPS_FOOTERBLOCK_ALL => 'footer_all' );
+
+
foreach ($oldzones as $zone) {
$this->blocks[$zone] = array();
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php 2014-11-15 21:39:25 UTC (rev 12847)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/xoopsblock.php 2014-11-16 10:46:18 UTC (rev 12848)
@@ -369,6 +369,8 @@
$side = "(b.side=0 OR b.side=1)";
} elseif ($side == XOOPS_CENTERBLOCK_ALL) {
$side = "(b.side=3 OR b.side=4 OR b.side=5 OR b.side=7 OR b.side=8 OR b.side=9 )";
+ } elseif ($side == XOOPS_FOOTERBLOCK_ALL) {
+ $side = "(b.side=10 OR b.side=11 OR b.side=12 )";
} else {
$side = "b.side=" . $side;
}
@@ -411,10 +413,12 @@
$where_query = " WHERE isactive=" . $isactive;
if (isset($side)) {
// get both sides in sidebox? (some themes need this)
- if ($side == 2) {
+ if ($side == XOOPS_SIDEBLOCK_BOTH) {
$side = "(side=0 OR side=1)";
- } elseif ($side == 6) {
+ } elseif ($side == XOOPS_CENTERBLOCK_ALL) {
$side = "(side=3 OR side=4 OR side=5 OR side=7 OR side=8 OR side=9)";
+ } elseif ($side == XOOPS_FOOTERBLOCK_ALL) {
+ $side = "(side=10 OR side=11 OR side=12)";
} else {
$side = "side=" . $side;
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php 2014-11-15 21:39:25 UTC (rev 12847)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php 2014-11-16 10:46:18 UTC (rev 12848)
@@ -31,6 +31,12 @@
define('XOOPS_CENTERBLOCK_BOTTOMLEFT', 7);
define('XOOPS_CENTERBLOCK_BOTTOMRIGHT', 8);
define('XOOPS_CENTERBLOCK_BOTTOM', 9);
+//bottom blocks (Timgno)
+define('XOOPS_FOOTERBLOCK_LEFT', 10);
+define('XOOPS_FOOTERBLOCK_CENTER', 11);
+define('XOOPS_FOOTERBLOCK_RIGHT', 12);
+define('XOOPS_FOOTERBLOCK_ALL', 13);
+
define('XOOPS_BLOCK_INVISIBLE', 0);
define('XOOPS_BLOCK_VISIBLE', 1);
define('XOOPS_MATCH_START', 0);
@@ -85,7 +91,7 @@
margin: 150px auto;
text-align: center;
background-color: #fff;
- background-image: url(images/img_errors.png);
+ background-image: url(/images/img_errors.png);
background-repeat: no-repeat;
background-position: 30px 50px;
padding-left: 300px;
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php 2014-11-15 21:39:25 UTC (rev 12847)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/block.php 2014-11-16 10:46:18 UTC (rev 12848)
@@ -89,7 +89,11 @@
5 => _AM_SYSTEM_BLOCKS_CBCENTER,
7 => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
8 => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
- 9 => _AM_SYSTEM_BLOCKS_CBBOTTOM));
+ 9 => _AM_SYSTEM_BLOCKS_CBBOTTOM,
+ 10 => _AM_SYSTEM_BLOCKS_CBFOOTERLEFT,
+ 11 => _AM_SYSTEM_BLOCKS_CBFOOTERCENTER,
+ 12 => _AM_SYSTEM_BLOCKS_CBFOOTERRIGHT));
+
$form->addElement($side_select);
// Order
$form->addElement(new XoopsFormText(_AM_SYSTEM_BLOCKS_WEIGHT, 'weight', 2, 5, $this->getVar('weight')));
@@ -399,6 +403,8 @@
$side = "(b.side=0 OR b.side=1)";
} elseif ($side == XOOPS_CENTERBLOCK_ALL) {
$side = "(b.side=3 OR b.side=4 OR b.side=5 OR b.side=7 OR b.side=8 OR b.side=9 )";
+ } elseif ($side == XOOPS_FOOTERBLOCK_ALL) {
+ $side = "(b.side=10 OR b.side=11 OR b.side=12 )";
} else {
$side = "b.side=" . $side;
}
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-11-15 21:39:25 UTC (rev 12847)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/class/thumbs/phpthumb.bmp.php 2014-11-16 10:46:18 UTC (rev 12848)
@@ -516,7 +516,7 @@
// number of bytes that follow, each of which contains the color index
// of a single pixel. Each run must be aligned on a word boundary.
for ($i = 0; $i < $secondbyte; ++$i) {
- $paletteindex = $this->LittleEndian2Int(substr($BMPpixelData, $pixeldataoffset++, 1));
+ $paletteindex = $this->LittleEndian2Int(substr($BMPpixelData, ++$pixeldataoffset, 1));
$col = $pixelcounter % $thisfile_bmp_header_raw['width'];
$row = $thisfile_bmp_header_raw['height'] - 1 - (($pixelcounter - $col) / $thisfile_bmp_header_raw['width']);
$thisfile_bmp['data'][$row][$col] = $thisfile_bmp['palette'][$paletteindex];
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/blocksadmin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/blocksadmin.php 2014-11-15 21:39:25 UTC (rev 12847)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/modules/system/language/english/admin/blocksadmin.php 2014-11-16 10:46:18 UTC (rev 12848)
@@ -40,6 +40,12 @@
define('_AM_SYSTEM_BLOCKS_CBCENTER',"Center Block - Center");
define('_AM_SYSTEM_BLOCKS_CBBOTTOMLEFT',"Center Block - Bottom left");
define('_AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT',"Center Block - Bottom right");
+
+define('_AM_SYSTEM_BLOCKS_CBFOOTERLEFT',"Footer Block - Left");
+define('_AM_SYSTEM_BLOCKS_CBFOOTERCENTER',"Footer Block - Center");
+define('_AM_SYSTEM_BLOCKS_CBFOOTERRIGHT',"Footer Block - Right");
+
+
define('_AM_SYSTEM_BLOCKS_CBBOTTOM',"Center Block - Bottom");
define('_AM_SYSTEM_BLOCKS_WEIGHT',"Weight");
define('_AM_SYSTEM_BLOCKS_VISIBLE',"Visible");
@@ -76,3 +82,7 @@
<li>Add a new custom block</li>
<li>Set block online or offline by clicking on <img class="tooltip" width="16" src="%s" alt="'._AM_SYSTEM_BLOCKS_DISPLAY.'" title="'._AM_SYSTEM_BLOCKS_DISPLAY.'"/> or <img class="tooltip" width="16" src="%s" alt="'._AM_SYSTEM_BLOCKS_HIDE.'" title="'._AM_SYSTEM_BLOCKS_HIDE.'" /></li>
</ul>');
+
+define('_AM_SYSTEM_BLOCKS_FOOTER_LEFT', 'Footer Left');
+define('_AM_SYSTEM_BLOCKS_FOOTER_CENTER', 'Footer Center');
+define('_AM_SYSTEM_BLOCKS_FOOTER_RIGHT', 'Footer Right');
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme.html 2014-11-15 21:39:25 UTC (rev 12847)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme.html 2014-11-16 10:46:18 UTC (rev 12848)
@@ -93,7 +93,9 @@
<!-- End center top blocks loop -->
<!-- Start content module page -->
- <{if $xoops_contents && ($xoops_contents != ' ') }><div id="content"><{$xoops_contents}></div><{/if}>
+ <{if $xoops_contents && ($xoops_contents != ' ') }>
+ <div id="content"><{$xoops_contents}></div>
+ <{/if}>
<!-- End content module -->
<!-- Start center bottom blocks loop -->
@@ -138,6 +140,45 @@
</td>
<{/if}>
<!-- End right blocks loop -->
+
+
+ <!-- =============================== Start footer blocks loop =============================== -->
+ <{if $xoBlocks.footer_left || $xoBlocks.footer_right || $xoBlocks.footer_center}>
+ <table>
+
+ <tr>
+ <{if $xoBlocks.footer_left}>
+ <td id="footerLeft">
+ <{foreach from=$xoBlocks.footer_left item=block}>
+ <{include file="$theme_name/theme_blockfooter_l.html"}>
+ <{/foreach}>
+ </td>
+ <{/if}>
+
+
+
+ <{if $xoBlocks.footer_center}>
+ <td id="footerCenter">
+ <{foreach from=$xoBlocks.footer_center item=block}>
+ <{include file="$theme_name/theme_blockfooter_c.html"}>
+ <{/foreach}>
+ </td>
+ <{/if}>
+
+ <{if $xoBlocks.footer_right}>
+ <td id="footerRight">
+ <{foreach from=$xoBlocks.footer_right item=block}>
+ <{include file="$theme_name/theme_blockfooter_r.html"}>
+ <{/foreach}>
+ </td>
+ <{/if}>
+
+ </tr>
+ </table>
+
+ <{/if}>
+ <!-- =============================== End footer blocks loop =============================== -->
+
</tr>
</table>
@@ -150,4 +191,4 @@
<!-- End footer -->
<!--{xo-logger-output}-->
</body>
-</html>
\ No newline at end of file
+</html>
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/css/bootstrap.min.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/css/bootstrap.min.css 2014-11-15 21:39:25 UTC (rev 12847)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/xbootstrap/css/bootstrap.min.css 2014-11-16 10:46:18 UTC (rev 12848)
@@ -1,7 +1,5 @@
/*!
- * Bootstrap v3.1.0 (http://getbootstrap.com)
+ * Bootstrap v3.3.1 (http://getbootstrap.com)
* Copyright 2011-2014 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- */
-
@@ Diff output truncated at 100000 characters. @@
|
