Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12869] XoopsCore/branches/2.5.x/2.5.8
|
From: <be...@us...> - 2014-11-24 11:31:48
|
Revision: 12869
http://sourceforge.net/p/xoops/svn/12869
Author: beckmi
Date: 2014-11-24 11:31:40 +0000 (Mon, 24 Nov 2014)
Log Message:
-----------
fixes for Footer blocks, incl. Default theme
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/style.css
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php
Added Paths:
-----------
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_c.html
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_l.html
XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_r.html
Modified: XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-11-23 20:41:51 UTC (rev 12868)
+++ XoopsCore/branches/2.5.x/2.5.8/docs/changelog.250.txt 2014-11-24 11:31:40 UTC (rev 12869)
@@ -13,6 +13,7 @@
- reverting couple of $i++ conversions (zyspec/mamba)
- updated xBootstrap to Bootstrap 3.3.1 (Angelo Rocha)
- Some code cleanup for private messages (Dingjie （Daniel） Yang/rgriffith)
+- Adding Footer blocks (timgno/mamba)
Security fixes
- ID: 1295 Added X-Frame-Options header to prevent clickjacking in modern browsers, reported by Narendra Bhati.
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-23 20:41:51 UTC (rev 12868)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/class/theme_blocks.php 2014-11-24 11:31:40 UTC (rev 12869)
@@ -106,8 +106,8 @@
XOOPS_FOOTERBLOCK_LEFT => 'footer_left',
- XOOPS_FOOTERBLOCK_RIGHT => 'footer_center' ,
- XOOPS_FOOTERBLOCK_CENTER => 'footer_right' ,
+ XOOPS_FOOTERBLOCK_RIGHT => 'footer_right' ,
+ XOOPS_FOOTERBLOCK_CENTER => 'footer_center' ,
XOOPS_FOOTERBLOCK_ALL => 'footer_all' );
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-23 20:41:51 UTC (rev 12868)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/include/defines.php 2014-11-24 11:31:40 UTC (rev 12869)
@@ -33,8 +33,8 @@
define('XOOPS_CENTERBLOCK_BOTTOM', 9);
// Footer blocks (Timgno)
define('XOOPS_FOOTERBLOCK_LEFT', 10);
-define('XOOPS_FOOTERBLOCK_CENTER', 11);
-define('XOOPS_FOOTERBLOCK_RIGHT', 12);
+define('XOOPS_FOOTERBLOCK_RIGHT', 11);
+define('XOOPS_FOOTERBLOCK_CENTER', 12);
define('XOOPS_FOOTERBLOCK_ALL', 13);
define('XOOPS_BLOCK_INVISIBLE', 0);
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/style.css
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/style.css 2014-11-23 20:41:51 UTC (rev 12868)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/style.css 2014-11-24 11:31:40 UTC (rev 12869)
@@ -69,7 +69,7 @@
#centercolumn th {background-color: #2A75C5; color: #fff; vertical-align: middle;}
#centerCcolumn, #bottomCcolumn {padding: 0 3px 1px 3px;}
-#centerCcolumn .blockTitle, #bottomCcolumn .blockTitle {padding: 3px; color: #2A75C5; font-weight: bold; margin-top: 0; margin-right: 0; margin-left: 0; font-size:1.1em;}
+#centerCcolumn .blockTitle, #bottomCcolumn .blockTitle {padding: 3px; color: #2A75C5; font-weight: bold; margin-top: 0; margin-right: 0; margin-left: 0; font-size:1.1em;}
#centerCcolumn .blockContent, #bottomCcolumn .blockContent {border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-right: 0; margin-left: 0; margin-bottom: 2px; line-height: 1.2em;}
#centerLcolumn, #bottomLcolumn, #centerRcolumn, #bottomRcolumn {
@@ -89,6 +89,18 @@
#rightcolumn .blockTitle {padding: 3px; background-color: #ddd; color: #2A75C5; font-weight: bold;}
#rightcolumn .blockContent {padding: 3px; line-height: 1.2em;}
+/* ------------------ start Footer Blocks ----------------- */
+
+#footerLeft .blockTitle, #footerCenter .blockTitle, #footerRight .blockTitle {
+ padding: 3px;
+ color: #2A75C5;
+ font-weight: bold;
+}
+
+#footerLeft .blockContent, #footerCenter .blockContent, #footerRight .blockContent {border-left: 1px solid #ccc; border-right: 1px solid #ccc; border-bottom: 1px solid #ddd; padding: 3px; margin-right: 0; margin-left: 0; margin-bottom: 2px; line-height: 1.2em;}
+
+/* ------------------ end Footer Blocks ----------------- */
+
#footerbar { background-image: url(hbar.gif); font-size:.9em; height : 23px;}
#footerbar td { vertical-align : middle; text-align:center;}
Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_c.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_c.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_c.html 2014-11-24 11:31:40 UTC (rev 12869)
@@ -0,0 +1,8 @@
+<div style="padding: 5px;">
+ <fieldset>
+ <{if $block.title}>
+ <legend class="blockTitle"><{$block.title}></legend>
+ <{/if}>
+ <div class="blockContent"><{$block.content}></div>
+ </fieldset>
+</div>
Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_l.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_l.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_l.html 2014-11-24 11:31:40 UTC (rev 12869)
@@ -0,0 +1,8 @@
+<div style="padding: 5px;">
+ <fieldset>
+ <{if $block.title}>
+ <legend class="blockTitle"><{$block.title}></legend>
+ <{/if}>
+ <div class="blockContent"><{$block.content}></div>
+ </fieldset>
+</div>
Added: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_r.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_r.html (rev 0)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/theme_blockfooter_r.html 2014-11-24 11:31:40 UTC (rev 12869)
@@ -0,0 +1,8 @@
+<div style="padding: 5px;">
+ <fieldset>
+ <{if $block.title}>
+ <legend class="blockTitle"><{$block.title}></legend>
+ <{/if}>
+ <div class="blockContent"><{$block.content}></div>
+ </fieldset>
+</div>
Modified: XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php 2014-11-23 20:41:51 UTC (rev 12868)
+++ XoopsCore/branches/2.5.x/2.5.8/htdocs/themes/default/xo-info.php 2014-11-24 11:31:40 UTC (rev 12869)
@@ -23,7 +23,7 @@
return array(
- 'copyright' => '© XOOPS Core Team, maintained by XOOPS Design Team led by Kris',
+ 'copyright' => '© XOOPS Core Team, maintained by XOOPS Design Team',
// Types of language constants
"languages" => array("main", "admin"),
);
|
