You can subscribe to this list here.
2012 |
Jan
|
Feb
(214) |
Mar
(139) |
Apr
(198) |
May
(187) |
Jun
(151) |
Jul
(210) |
Aug
(169) |
Sep
(58) |
Oct
(53) |
Nov
(54) |
Dec
(301) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2013 |
Jan
(348) |
Feb
(178) |
Mar
(219) |
Apr
(154) |
May
(117) |
Jun
(194) |
Jul
(61) |
Aug
(132) |
Sep
(121) |
Oct
(110) |
Nov
(11) |
Dec
(18) |
2014 |
Jan
(34) |
Feb
(50) |
Mar
(82) |
Apr
(98) |
May
(39) |
Jun
(111) |
Jul
(67) |
Aug
(36) |
Sep
(33) |
Oct
(26) |
Nov
(53) |
Dec
(44) |
2015 |
Jan
(29) |
Feb
(47) |
Mar
(25) |
Apr
(19) |
May
(23) |
Jun
(20) |
Jul
(49) |
Aug
(7) |
Sep
(10) |
Oct
(10) |
Nov
(4) |
Dec
(25) |
2016 |
Jan
(8) |
Feb
(7) |
Mar
(1) |
Apr
|
May
(3) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(7) |
Dec
(5) |
2017 |
Jan
(4) |
Feb
|
Mar
|
Apr
|
May
(15) |
Jun
|
Jul
(18) |
Aug
(24) |
Sep
|
Oct
(14) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
(22) |
Mar
|
Apr
(11) |
May
(1) |
Jun
(17) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
(6) |
Nov
(5) |
Dec
|
2019 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
2025 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <txm...@us...> - 2015-03-27 12:21:25
|
Revision: 13027 http://sourceforge.net/p/xoops/svn/13027 Author: txmodxoops Date: 2015-03-27 12:21:24 +0000 (Fri, 27 Mar 2015) Log Message: ----------- Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/pagenav.php Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/pagenav.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/pagenav.php 2015-03-27 09:43:23 UTC (rev 13026) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/pagenav.php 2015-03-27 12:21:24 UTC (rev 13027) @@ -197,7 +197,7 @@ $xoopsTpl->assign('onchange', "location=this.options[this.options.selectedIndex].value;"); $xoopsTpl->assign('pagination_select', true); $xoopsTpl->assign('showbutton', $showbutton); - $xoopsTpl->assign('align', ' pagination-' . $align); + $xoopsTpl->assign('align', ' pull-' . $align); $ret = $xoopsTpl->fetch('db:system_pagenav.html'); $xoopsTpl->clear_assign('xo_select'); return $ret; |
From: <txm...@us...> - 2015-03-27 09:43:33
|
Revision: 13026 http://sourceforge.net/p/xoops/svn/13026 Author: txmodxoops Date: 2015-03-27 09:43:23 +0000 (Fri, 27 Mar 2015) Log Message: ----------- Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin/avatars/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin/avatars/main.php Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php 2015-03-26 23:11:44 UTC (rev 13025) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php 2015-03-27 09:43:23 UTC (rev 13026) @@ -280,11 +280,11 @@ 'xoops_dirname' => isset($GLOBALS['xoopsModule'])&& is_object($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar('dirname') : 'system', 'xoops_banner' => ($GLOBALS['xoopsConfig']['banners'] && $this->renderBanner) ? xoops_getbanner() : ' ', 'xoops_pagetitle' => isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar('name') : htmlspecialchars($GLOBALS['xoopsConfig']['slogan'], ENT_QUOTES))); - // From XoopsCore by Timgno + // From XoopsCore by Timgno - Added '/assets/' folder $this->template->assign(array( 'theme_path' => $this->path, 'theme_tpl' => $this->path . '/xotpl', 'theme_url' => $this->url, - 'theme_img' => $this->url . '/img', 'theme_icons' => $this->url . '/icons', - 'theme_css' => $this->url . '/css', 'theme_js' => $this->url . '/js', + 'theme_img' => $this->url . '/assets/img', 'theme_icons' => $this->url . '/assets/icons', + 'theme_css' => $this->url . '/assets/css', 'theme_js' => $this->url . '/assets/js', 'theme_lang' => $this->url . '/language', )); // -------------------------------------------------------------------- @@ -405,7 +405,6 @@ return true; } } - return false; } Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin/avatars/main.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin/avatars/main.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin/avatars/main.php 2015-03-27 09:43:23 UTC (rev 13026) @@ -0,0 +1,308 @@ +<?php +// $Id: main.php 12706 2014-07-13 00:21:21Z beckmi $ +// ------------------------------------------------------------------------ // +// XOOPS - PHP Content Management System // +// Copyright (c) 2000-2014 XOOPS Project (www.xoops.org) // +// <http://www.xoops.org/> // +// ------------------------------------------------------------------------ // +// This program is free software; you can redistribute it and/or modify // +// it under the terms of the GNU General Public License as published by // +// the Free Software Foundation; either version 2 of the License, or // +// (at your option) any later version. // +// // +// You may not change or alter any portion of this comment or credits // +// of supporting developers from this source code or any supporting // +// source code which is considered copyrighted (c) material of the // +// original comment or credit authors. // +// // +// This program is distributed in the hope that it will be useful, // +// but WITHOUT ANY WARRANTY; without even the implied warranty of // +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // +// GNU General Public License for more details. // +// // +// You should have received a copy of the GNU General Public License // +// along with this program; if not, write to the Free Software // +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // +// ------------------------------------------------------------------------ // +// Author: Kazumi Ono (AKA onokazu) // +// URL: http://www.myweb.ne.jp/, http://www.xoops.org/, http://jp.xoops.org/ // +// Project: The XOOPS Project // +// ------------------------------------------------------------------------- // + +// Check users rights +if ( !is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid()) ) exit( _NOPERM ); +// Check is active +if ( !xoops_getModuleOption('active_avatars', 'system') ) redirect_header( 'admin.php', 2, _AM_SYSTEM_NOTACTIVE ); +// Get Action type +$op = system_CleanVars ( $_REQUEST, 'op', 'list', 'string' ); + +switch ($op) { + + case 'list': default: + // Define main template + $xoopsOption['template_main'] = 'system_avatars.html'; + // Call Header + xoops_cp_header(); + // Define Stylesheet + $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' ); + $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.min.js'); + $xoTheme->addScript('modules/system/js/admin.js'); + // Define Breadcrumb and tips + $xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath') ); + $xoBreadCrumb->addHelp( system_adminVersion('avatars', 'help') ); + $xoBreadCrumb->addTips( _AM_SYSTEM_AVATAR_TIPS ); + $xoBreadCrumb->render(); + // Get avatar handler + $avt_handler =& xoops_getmodulehandler('avatar'); + // Get User Config + $config_handler =& xoops_gethandler('config'); + $xoopsConfigUser = $config_handler->getConfigsByCat( XOOPS_CONF_USER ); + // User language + xoops_loadLanguage('user'); + // Count avatars + $savatar_count = $avt_handler->getCount(new Criteria('avatar_type', 'S')); + $cavatar_count = $avt_handler->getCount(new Criteria('avatar_type', 'C')); + // Assign Template variables + $xoopsTpl->assign( 'view_cat', true ); + $xoopsTpl->assign( 'count_system', $savatar_count ); + $xoopsTpl->assign( 'count_custom', $cavatar_count ); + // Create form + $avatar = $avt_handler->create(); + $form = $avatar->getForm(); + // Assign form + $xoopsTpl->assign('form', $form->render()); + // Call Footer + xoops_cp_footer(); + break; + + case 'listavt': + // Get Avatar type + $type = system_CleanVars ( $_REQUEST, 'type', 'c', 'string' ); + $start = system_CleanVars ( $_REQUEST, 'start', 0, 'int' ); + // Define main template + $xoopsOption['template_main'] = 'system_avatars.html'; + // Call Header + xoops_cp_header(); + // Define Stylesheet + $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css'); + // Define scripts + $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.min.js'); + $xoTheme->addScript('modules/system/js/admin.js'); + // Define Breadcrumb and tips + $xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath') ); + $xoBreadCrumb->addLink( ( $type == 's' ? _AM_SYSTEM_AVATAR_SYSTEM : _AM_SYSTEM_AVATAR_CUSTOM ) ); + $xoBreadCrumb->addHelp( system_adminVersion('avatars', 'help') . '#' . $type ); + $xoBreadCrumb->addTips( _AM_SYSTEM_AVATAR_TIPS ); + $xoBreadCrumb->render(); + // Get avatar handler + $avt_handler =& xoops_gethandler('avatar'); + // Count avatars + $savatar_count = $avt_handler->getCount(new Criteria('avatar_type', 'S')); + $cavatar_count = $avt_handler->getCount(new Criteria('avatar_type', 'C')); + // Assign Template variables + $xoopsTpl->assign( 'type', $type); + $xoopsTpl->assign( 'count_system', $savatar_count ); + $xoopsTpl->assign( 'count_custom', $cavatar_count ); + // Filter avatars + $criteria = new Criteria('avatar_type', $type); + $avtcount = $avt_handler->getCount($criteria); + // Get avatar list + $criteria->setStart($start); + $criteria->setLimit( xoops_getModuleOption('avatars_pager', 'system')); + $avatars = $avt_handler->getObjects($criteria, true); + // Construct avatars array + $avatar_list = array(); + $i=0; + foreach (array_keys($avatars) as $i) { + $avatar_list[$i] = $avatars[$i]->toArray(); + $avatar_list[$i]['type'] = $type; + $avatar_list[$i]['count'] = count($avt_handler->getUser($avatars[$i])); + if($type == 'c') { + $user = $avt_handler->getUser($avatars[$i]); + if(is_array($user) && isset($user[0])) $avatar_list[$i]['user'] = $user[0]; + } + } + $xoopsTpl->assign('avatars_list', $avatar_list); + // Display Page Navigation + if ( $avtcount > xoops_getModuleOption('avatars_pager') ) { + $nav = new XoopsPageNav($avtcount, xoops_getModuleOption('avatars_pager', 'system'), $start, 'start', 'fct=avatars&type=' . $type . '&op=listavt'); + $xoopsTpl->assign('nav_menu', $nav->renderNav()); + } + // Call Footer + xoops_cp_footer(); + break; + + case 'edit': + // Define main template + $xoopsOption['template_main'] = 'system_avatars.html'; + // Call Header + xoops_cp_header(); + // Define Stylesheet + $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css'); + // Define Breadcrumb and tips + $xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath') ); + $xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_EDIT ); + $xoBreadCrumb->addHelp( system_adminVersion('avatars', 'help') . '#edit' ); + $xoBreadCrumb->addTips( _AM_SYSTEM_AVATAR_TIPS ); + $xoBreadCrumb->render(); + // User language + xoops_loadLanguage('user'); + // Get avatar handler + $avt_handler =& xoops_getmodulehandler('avatar'); + $avatar_id = system_CleanVars ( $_REQUEST, 'avatar_id', 0, 'int' ); + if ( $avatar_id > 0 ) { + $avatar = $avt_handler->get( $avatar_id ); + // Create form + $form = $avatar->getForm(); + // Assign form + $xoopsTpl->assign('form', $form->render()); + } else { + redirect_header('admin.php?fct=avatars', 1, _AM_SYSTEM_DBERROR); + } + // Call Footer + xoops_cp_footer(); + break; + + case 'save': + // Check security + if ( !$GLOBALS['xoopsSecurity']->check() ) { + redirect_header( 'admin.php?fct=avatars', 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors() ) ); + exit(); + } + $config_handler =& xoops_gethandler( 'config' ); + $xoopsConfigUser = $config_handler->getConfigsByCat( XOOPS_CONF_USER ); + // Upload class + include_once $GLOBALS['xoops']->path( '/class/uploader.php' ); + + $uploader = new XoopsMediaUploader( XOOPS_UPLOAD_PATH . '/avatars', array('image/gif', 'image/jpeg', 'image/pjpeg', 'image/x-png', 'image/png'), $xoopsConfigUser['avatar_maxsize'], $xoopsConfigUser['avatar_width'], $xoopsConfigUser['avatar_height']); + // Get avatar handler + $avt_handler =& xoops_gethandler('avatar'); + // Get avatar id + $avatar_id = system_CleanVars ( $_POST, 'avatar_id', 0, 'int' ); + if ( $avatar_id > 0 ) { + $avatar =& $avt_handler->get( $avatar_id ); + } else { + $avatar =& $avt_handler->create(); + } + $err = array(); + if ($uploader->fetchMedia('avatar_file')) { + $uploader->setPrefix('savt'); + if (!$uploader->upload()) { + $err[] = $uploader->getErrors(); + } else { + $avatar->setVars( $_POST ); + $avatar->setVar('avatar_file', 'avatars/' . $uploader->getSavedFileName() ); + $avatar->setVar('avatar_mimetype', $uploader->getMediaType()); + $avatar->setVar('avatar_type', 's'); + if (!$avt_handler->insert($avatar)) { + $err[] = sprintf(_FAILSAVEIMG, $avatar->getVar('avatar_name') ); + } + } + } else { + $file = system_CleanVars ( $_REQUEST, 'avatar_file', 'blank.gif', 'string' ); + $avatar->setVars($_REQUEST); + $avatar->setVar('avatar_file', 'avatars/' . $file); + if (!$avt_handler->insert($avatar)) { + $err[] = sprintf(_FAILSAVEIMG, $avatar->getVar('avatar_name')); + } + } + if (count($err) > 0) { + // Define main template + $xoopsOption['template_main'] = 'system_header.html'; + // Call header + xoops_cp_header(); + // Define Stylesheet + $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' ); + // Define Breadcrumb and tips + $xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath') ); + $xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_ERROR ); + $xoBreadCrumb->render(); + // Dsiplay errors + xoops_error( $err ); + // Call Footer + xoops_cp_footer(); + exit(); + } + redirect_header( 'admin.php?fct=avatars', 2, _AM_SYSTEM_DBUPDATED ); + break; + + case 'display': + // Get avatar handler + $avt_handler =& xoops_gethandler('avatar'); + // Get avatar id + $avatar_id = system_CleanVars ( $_POST, 'avatar_id', 0, 'int' ); + if ( $avatar_id > 0 ) { + // Get avatar + $avatar =& $avt_handler->get( $avatar_id ); + $old = $avatar->getVar('avatar_display'); + // Set value + $avatar->setVar('avatar_display', !$old ); + if (!$avt_handler->insert($avatar)) { + $error=true; + } + } + break; + + case 'delfile': + // Define main template + $xoopsOption['template_main'] = 'system_avatars.html'; + // Call Header + xoops_cp_header(); + // Define Stylesheet + $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css'); + // Define Breadcrumb and tips + $xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath') ); + $xoBreadCrumb->addLink( _AM_SYSTEM_AVATAR_DELETE ); + $xoBreadCrumb->addHelp( system_adminVersion('avatars', 'help') . '#delete' ); + $xoBreadCrumb->render(); + // Get variables + $user_id = system_CleanVars ( $_REQUEST, 'user_id', 0, 'int' ); + $avatar_id = system_CleanVars ( $_REQUEST, 'avatar_id', 0, 'int' ); + // Get avatar handler + $avt_handler =& xoops_gethandler('avatar'); + if ( $avatar_id > 0 ) { + $avatar = $avt_handler->get($avatar_id); + $msg = '<div class="spacer"><img src="' . XOOPS_UPLOAD_URL . '/' . $avatar->getVar('avatar_file','s') . '" alt="" /></div><div class="txtcenter bold">' . $avatar->getVar('avatar_name', 's') . '</div>' . _AM_SYSTEM_AVATAR_SUREDEL; + // Display message + xoops_confirm(array('op' => 'delfileok', 'avatar_id' => $avatar_id, 'fct' => 'avatars', 'user_id' => $user_id), 'admin.php', $msg ); + } else { + redirect_header('admin.php?fct=avatars', 1, _AM_SYSTEM_DBERROR); + } + // Call footer + xoops_cp_footer(); + break; + + case 'delfileok': + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('admin.php?fct=avatars',1, 3, implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + } + $avatar_id = system_CleanVars ( $_POST, 'avatar_id', 0, 'int' ); + if ($avatar_id <= 0) { + redirect_header('admin.php?fct=avatars', 1, _AM_SYSTEM_DBERROR); + } + $avt_handler = xoops_gethandler('avatar'); + $avatar =& $avt_handler->get( $avatar_id ); + if ( !is_object( $avatar ) ) { + redirect_header('admin.php?fct=avatars', 1, _AM_SYSTEM_DBERROR); + } + if (!$avt_handler->delete( $avatar )) { + // Call Header + xoops_cp_header(); + // Display errors + xoops_error( sprintf( _AM_SYSTEM_AVATAR_FAILDEL, $avatar->getVar('avatar_id') ) ); + // Call Footer + xoops_cp_footer(); + exit(); + } + $file = $avatar->getVar('avatar_file'); + // Delete file + @unlink(XOOPS_UPLOAD_PATH.'/'.$file); + // Update member profil + if (isset($user_id) && $avatar->getVar('avatar_type') == 'C') { + $xoopsDB->query("UPDATE ".$xoopsDB->prefix('users')." SET user_avatar='blank.gif' WHERE uid=".intval($user_id)); + } else { + $xoopsDB->query("UPDATE ".$xoopsDB->prefix('users')." SET user_avatar='blank.gif' WHERE user_avatar='".$file."'"); + } + redirect_header( 'admin.php?fct=avatars', 2, _AM_SYSTEM_DBUPDATED ); + break; +} |
From: <txm...@us...> - 2015-03-26 23:11:47
|
Revision: 13025 http://sourceforge.net/p/xoops/svn/13025 Author: txmodxoops Date: 2015-03-26 23:11:44 +0000 (Thu, 26 Mar 2015) Log Message: ----------- Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/default.js Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/default.js =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/default.js (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/default.js 2015-03-26 23:11:44 UTC (rev 13025) @@ -0,0 +1,31 @@ +/* + * Default CPanel Admin Theme script + * Powered by Xoops (http://www.xoops.org) + * + * Written by Txmod Xoops (web...@tx...) + * + * For more visit http://www.txmodxoops.org + * + */ + +// Starting the script on page load +$(document).ready(function(){ + // View tooltip + //$('[data-toggle="tooltip"]').tooltip({ track: true }); + + // Script to show and hide categories and images form of the section system image manager + $(function() { + $('div#xo-category-add').hide(); + $('button#xo-addcat-btn').on('click', function(e) { + e.preventDefault(); + $("div#xo-category-add").toggle(); + $("div#xo-images-add").hide(); + }); + $('div#xo-images-add').hide(); + $('button#xo-addimg-btn').on('click', function(e) { + e.preventDefault(); + $("div#xo-images-add").toggle(); + $("div#xo-category-add").hide(); + }); + }); +}); \ No newline at end of file |
From: <txm...@us...> - 2015-03-26 22:55:03
|
Revision: 13024 http://sourceforge.net/p/xoops/svn/13024 Author: txmodxoops Date: 2015-03-26 22:55:00 +0000 (Thu, 26 Mar 2015) Log Message: ----------- Updated Fixed bugs default admin theme Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_blocks.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_comments.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_images.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_modules.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_templates.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/style.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tabs.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_icons.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_toolbar.html Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_blocks.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_blocks.html 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_blocks.html 2015-03-26 22:55:00 UTC (rev 13024) @@ -107,10 +107,11 @@ </tbody> </table> </div> -<{/if}> +<{else}> <div class="form-inline" id="xo-block-add" <{if $filterform}>class="hide"<{/if}>> <{if !$filterform}><br /><{/if}> <{$blockform}> </div> <!-- Preview block --> -<div id="xo-preview-block" class="hide"></div> \ No newline at end of file +<div id="xo-preview-block" class="hide"></div> +<{/if}> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_comments.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_comments.html 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_comments.html 2015-03-26 22:55:00 UTC (rev 13024) @@ -13,11 +13,10 @@ </div> </div> <div class="clear"></div> -<table id="xo-comment-sorter" class="table table-striped"> +<table id="xo-comment-sorter" class="table table-striped table-bordered"> <thead> <tr> <th class="text-center width5"><input type='checkbox' name='allbox' id='allbox' onclick='xoopsCheckAll("commentslist", "allbox");' value='Check All' /></th> - <th class="text-center width5"></th> <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_TITLE}></th> <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_POSTED}></th> <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_IP}></th> @@ -66,4 +65,4 @@ <{/foreach}> <!--Pop-pup--> <div class="text-right"><{$nav}></div> -<{/if}> +<{/if}> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_images.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_images.html 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_images.html 2015-03-26 22:55:00 UTC (rev 13024) @@ -4,13 +4,13 @@ <div class="pull-right"> <div class="xo-buttons"> <{if !$edit_form && !$listimg}> - <button id="xo-addcat-btn" class="btn btn-default" onclick="xo_toggle('div#xo-category-add');" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>"> + <button id="xo-addcat-btn" class="btn btn-default" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>"> <img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}>" /> <{$smarty.const._AM_SYSTEM_IMAGES_ADDCAT}> </button> <{/if}> <{if $cat_img || $listimg}> - <button id="xo-addimg-btn" class="btn btn-default" onclick="xo_toggle('div#xo-images-add');" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>"> + <button id="xo-addimg-btn" class="btn btn-default" title="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>"> <img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}>" /> <{$smarty.const._AM_SYSTEM_IMAGES_ADDIMG}> </button> @@ -72,7 +72,7 @@ <{/if}> <{if $images}> <!-- Image list --> -<div id="xo-category-add" class="show"> +<div id="xo-category-add"> <{foreach item=img from=$images}> <div class="pull-left"> <div class="ui-corner-all xo-thumb text-center"> @@ -113,13 +113,13 @@ </div> <{if $nav_menu}><div class="xo-avatar-pagenav pull-right"><{$nav_menu}></div><div class="clear spacer"></div><{/if}> <{else}> -<div id="xo-category-add" class="show"> +<div id="xo-category-add"> <div class="clear"></div> </div> <{/if}> <!-- Add Image form --> -<div id="xo-images-add" class="hide"> +<div id="xo-images-add"> <br /> <{$image_form.javascript}> <form name="<{$image_form.name}>" id="<{$image_form.name}>" action="<{$image_form.action}>" method="<{$image_form.method}>" <{$image_form.extra}> > @@ -137,7 +137,7 @@ <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div> <div class="spacer"><{$element.description}></div> </td> - <td class="even"><{$element.body}></td> + <td class="form-inline"><{$element.body}></td> </tr> <{else}> <{$element.body}> @@ -148,7 +148,7 @@ </form> </div> <!-- Add Category form --> -<div id="xo-category-add" class="hide"> +<div id="xo-category-add"> <br /> <{$imagecat_form.javascript}> <form name="<{$imagecat_form.name}>" id="<{$imagecat_form.name}>" action="<{$imagecat_form.action}>" method="<{$imagecat_form.method}>" <{$imagecat_form.extra}> > @@ -166,7 +166,7 @@ <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div> <div class="spacer"><{$element.description}></div> </td> - <td class="even"><{$element.body}></td> + <td class="form-inline"><{$element.body}></td> </tr> <{else}> <{$element.body}> @@ -178,7 +178,7 @@ </div> <!-- Edit form image --> <{if $edit_form}> -<div id="xo-images-add" class="show"> +<div id="xo-images-add"> <{$edit_thumbs}> <br /> <{$edit_form.javascript}> @@ -197,7 +197,7 @@ <div class="spacer bold"><{$element.caption}><{if $element.required}><span class="red"> *</span><{/if}></div> <div class="spacer"><{$element.description}></div> </td> - <td class="even"><{$element.body}></td> + <td class="form-inline"><{$element.body}></td> </tr> <{else}> <{$element.body}> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_modules.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_modules.html 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_modules.html 2015-03-26 22:55:00 UTC (rev 13024) @@ -5,8 +5,10 @@ IMG_OFF = '<{xoAdminIcons cancel.png}>'; </script> <div class="pull-left"> - <img class="cursorpointer" onclick="system_moduleLargeView();" src="<{xoAdminIcons view_large.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" /> - <img class="cursorpointer" onclick="system_moduleListView();" src="<{xoAdminIcons view_small.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLINE}>" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLINE}>" /> + <button class="btn btn-default cursorpointer" onclick="system_moduleLargeView();" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>"><i class="glyphicon glyphicon-th-large"></i></button> + <!-- <img class="cursorpointer" src="<{xoAdminIcons view_large.png}>" onclick="system_moduleLargeView();" alt="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" /> --> + <button class="btn btn-default cursorpointer" onclick="system_moduleListView();" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>"><i class="glyphicon glyphicon-th-list"></i></button> + <!-- <img class="cursorpointer" onclick="system_moduleListView();" src="<{xoAdminIcons view_small.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLINE}>" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLINE}>" /> --> </div> <div class="pull-right"> <div class="xo-buttons"> @@ -99,7 +101,7 @@ </td> <td> <{if $row.warning_update == 1}> - <a class="tooltip maxi" style="color:red;" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=update&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>"><{$row.version}></a><br /><{$smarty.const._AM_SYSTEM_MODULES_UPDATE}> + <a class="maxi" style="color:red;" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=update&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>"><{$row.version}></a><br /><{$smarty.const._AM_SYSTEM_MODULES_UPDATE}> <{else}> <{$row.version}> <{$row.module_status}> <{/if}> @@ -152,7 +154,7 @@ </td> <td> <{if $row.warning_update == 1}> - <a class="tooltip maxi" style="color:red;" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=update&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>"><{$row.version}></a><br /><{$smarty.const._AM_SYSTEM_MODULES_UPDATE}> + <a class="maxi" style="color:red;" href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=update&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_UPDATE}>"><{$row.version}></a><br /><{$smarty.const._AM_SYSTEM_MODULES_UPDATE}> <{else}> <{$row.version}> <{$row.module_status}> <{/if}> @@ -193,8 +195,10 @@ <{if $toinstall_mods}> <div class="pull-left"> - <img class="cursorpointer" onclick="system_moduleLargeView();" src="<{xoAdminIcons view_large.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" /> - <img class="cursorpointer" onclick="system_moduleListView();" src="<{xoAdminIcons view_small.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLINE}>" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLINE}>" /> + <button class="btn btn-default cursorpointer" onclick="system_moduleLargeView();" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>"><i class="glyphicon glyphicon-th-large"></i></button> + <!-- <img class="cursorpointer" src="<{xoAdminIcons view_large.png}>" onclick="system_moduleLargeView();" alt="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>" /> --> + <button class="btn btn-default cursorpointer" onclick="system_moduleListView();" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLARGE}>"><i class="glyphicon glyphicon-th-list"></i></button> + <!-- <img class="cursorpointer" onclick="system_moduleListView();" src="<{xoAdminIcons view_small.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLINE}>" title="<{$smarty.const._AM_SYSTEM_MODULES_VIEWLINE}>" /> --> </div> <div class="clear spacer"></div> <table class="table table-bordered"> @@ -223,8 +227,8 @@ </td> <td><{$row.version}> <{$row.module_status}></td> <td class="xo-modsimages"> - <a href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=install&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_INSTALL}>"> - <img src="<{xoAdminIcons install.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_INSTALL}>" /> + <a href="<{$xoops_url}>/modules/system/admin.php?fct=modulesadmin&op=install&module=<{$row.dirname}>" title="<{$smarty.const._AM_SYSTEM_MODULES_INSTALL}>"><img src="<{xoAdminIcons install.png}>" alt="<{$smarty.const._AM_SYSTEM_MODULES_INSTALL}>" /> + <!-- <i class="glyphicon glyphicon-circle-arrow-up"></i> --> </a> <img class="cursorpointer" onclick="display_dialog(<{$row.mid}>, true, true, 'slide', 'slide', 240, 450);" src="<{xoAdminIcons info.png}>" alt="<{$smarty.const._INFO}>" title="<{$smarty.const._INFO}>" /> </td> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_templates.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_templates.html 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_templates.html 2015-03-26 22:55:00 UTC (rev 13024) @@ -11,8 +11,8 @@ </thead> <tbody> <tr> - <td class="aligntop col-md-2"><div id="fileTree" class="display_folder"></div></td> - <td class="aligntop col-md-10"> + <td class="aligntop col-md-1"><div id="fileTree" class="display_folder"></div></td> + <td class="aligntop col-md-11"> <div id="display_form" class="form-inline"><{$form}></div> <div id="display_contenu"></div> <div id='display_message' class="text-center" style="display:none;"></div> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css 2015-03-26 22:55:00 UTC (rev 13024) @@ -206,13 +206,13 @@ text-decoration: underline; } -/*=============== styles for tables =================*/ +/*=============== styles for tables =================*//* table { margin: 0; width: 100%; border: none; border-collapse: separate /*collapse*/; - border-spacing: 1px; + /*border-spacing: 1px; } th { @@ -220,7 +220,7 @@ color: #fff; padding: 4px; vertical-align: middle; -} +}*/ .outer { width: 99%; @@ -255,7 +255,7 @@ padding: 5px; font-weight: bold; } - +/* tr.head td { background-color: #BDE3FB; padding: 5px; @@ -280,7 +280,7 @@ font-weight: bold; } -td.head {max-width: 300px !important;} +td.head {max-width: 300px !important;}*/ /*============= XOOPS Editors =============*/ body.mceContentBody { background-color: #fff; Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css 2015-03-26 22:55:00 UTC (rev 13024) @@ -71,7 +71,7 @@ background-position: left top; background-repeat: no-repeat; font-weight: bold; - height: 30px; + height: 43px; vertical-align: middle; padding: 10px 40px 0 40px; border-bottom: 3px solid #393e41; Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css 2015-03-26 22:55:00 UTC (rev 13024) @@ -12,7 +12,7 @@ */ #xo-logger-errors, #xo-logger-deprecated, #xo-logger-queries, #xo-logger-blocks, #xo-logger-extra, #xo-logger-timers{ - max-width: 95% !important; + max-width: 96% !important; } #xo-logger-output { margin: 0 auto !important; @@ -24,7 +24,7 @@ margin-top: -2px; padding-left: 2%; padding-right: 2%; - width: 96% !important; + width: 100% !important; } #xo-logger-errors {} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/style.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/style.css 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/style.css 2015-03-26 22:55:00 UTC (rev 13024) @@ -114,4 +114,4 @@ background: #EEEDED; color: #333; border: 2px solid #666; -} +} \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tabs.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tabs.css 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tabs.css 2015-03-26 22:55:00 UTC (rev 13024) @@ -14,7 +14,7 @@ list-style:none; margin:0 !important; padding: 10px 0 0 0; - height:30px; + height:43px; border-bottom: 3px solid #393e41; } Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php 2015-03-26 22:55:00 UTC (rev 13024) @@ -74,7 +74,8 @@ $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/assets/js/formenu.js'); $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/assets/js/menu.js'); $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/assets/js/tooltip.js'); - $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/assets/js/tabs.jquery.tools.min.js'); + $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/assets/js/tabs.jquery.tools.min.js'); + $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/assets/js/default.js'); $tpl->assign('lang_cp', _CPHOME); //start system overview Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_icons.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_icons.html 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_icons.html 2015-03-26 22:55:00 UTC (rev 13024) @@ -4,16 +4,16 @@ <div id="xo-icon"> <{foreach item=op from=$mod_options}> <a href="<{$op.link}>" data-toggle="tooltip" data-original-title="<{$op.desc}>" title="<{$op.desc}>"> - <img src='<{$op.icon|default:"$theme_icons/icon_options.png"}>' alt="<{$op.desc}>" /> + <img class="img-rounded" src='<{$op.icon|default:"$theme_icons/icon_options.png"}>' alt="<{$op.desc}>" /> <br /><span><{$op.title}></span> </a> <{/foreach}> <a href="<{xoAppUrl modules/system/admin.php}>" data-toggle="tooltip" data-original-title="<{$smarty.const._AM_SYSTEM_CONFIG}>" title="<{$smarty.const._AM_SYSTEM_CONFIG}>"> - <img src='<{"$theme_icons/configuration.png"}>' /> + <img class="img-rounded" src='<{"$theme_icons/configuration.png"}>' /> <span><{$smarty.const._AM_SYSTEM_CONFIG}></span> </a> <a href="<{xoAppUrl modules/system/help.php}>" data-toggle="tooltip" data-original-title="<{$smarty.const._AM_SYSTEM_HELP}>" title="<{$smarty.const._AM_SYSTEM_HELP}>"> - <img src='<{"$theme_icons/help.png"}>' /> + <img class="img-rounded" src='<{"$theme_icons/help.png"}>' /> <span><{$smarty.const._AM_SYSTEM_HELP}></span> </a> </div> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_toolbar.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_toolbar.html 2015-03-25 23:37:10 UTC (rev 13023) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_toolbar.html 2015-03-26 22:55:00 UTC (rev 13024) @@ -2,20 +2,19 @@ <div id="xo-modname"> <{$modname}> </div> - <div id="xo-toolbar"> + <div class="thumbnail" id="xo-toolbar"> <{foreach item=op from=$mod_options}> - <a class="tooltip" href="<{$op.link}>" title="<{$op.title}>"> - <img src='<{$op.icon|default:"$theme_icons/icon_options.png"}>' alt="<{$op.title}>" /> + <a href="<{$op.link}>" data-toggle="tooltip" data-original-title="<{$op.title}>" title="<{$op.title}>"> + <img class="img-rounded" src='<{$op.icon|default:"$theme_icons/icon_options.png"}>' alt="<{$op.title}>" /> </a> - <{/foreach}> - + <{/foreach}> <{if $moddir!='system' && $mod_options}> - <a class="tooltip" href="<{$xoops_url}>/modules/system/admin.php?fct=preferences&op=showmod&mod=<{$modid}>" title="<{$smarty.const._OXYGEN_SITEPREF}>"> - <img src="<{$theme_icons}>/prefs.png" alt="<{$smarty.const._OXYGEN_SITEPREF}>" /> + <a href="<{$xoops_url}>/modules/system/admin.php?fct=preferences&op=showmod&mod=<{$modid}>" data-toggle="tooltip" data-original-title="<{$smarty.const._OXYGEN_SITEPREF}>" title="<{$smarty.const._OXYGEN_SITEPREF}>"> + <img class="img-rounded" src="<{$theme_icons}>/prefs.png" alt="<{$smarty.const._OXYGEN_SITEPREF}>" /> </a> <{/if}> - <a class="tooltip" href="<{xoAppUrl modules/system/help.php}>" title="<{$smarty.const._AM_SYSTEM_HELP}>"> - <img src='<{"$theme_icons/help.png"}>' /> + <a href="<{xoAppUrl modules/system/help.php}>" data-toggle="tooltip" data-original-title="<{$smarty.const._AM_SYSTEM_HELP}>" title="<{$smarty.const._AM_SYSTEM_HELP}>"> + <img class="img-rounded" src='<{"$theme_icons/help.png"}>' /> </a> </div> </div> \ No newline at end of file |
From: <txm...@us...> - 2015-03-25 23:37:20
|
Revision: 13023 http://sourceforge.net/p/xoops/svn/13023 Author: txmodxoops Date: 2015-03-25 23:37:10 +0000 (Wed, 25 Mar 2015) Log Message: ----------- Updated Fixed bugs Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tooltip.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/tooltip.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_head.html Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tooltip.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tooltip.css 2015-03-25 17:01:23 UTC (rev 13022) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tooltip.css 2015-03-25 23:37:10 UTC (rev 13023) @@ -9,7 +9,7 @@ * @maintained Xoops Design Theme <http://www.xoops.org/> * * @version $Id -*/ +*//* #tooltip { position: absolute; background: #D2E2F9; @@ -41,4 +41,28 @@ #tooltip img { padding-bottom: 10px !important; text-align: center !important; -} +}*/ + +[data-toggle="tooltip"] { + display: inline-block; + width: 5em; + position: relative; + background: #D2E2F9; + padding: 10px; + color: #333; + display: none; + border: 1px solid #A4C3EF; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; + border-radius: 3px; + box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + -moz-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + -webkit-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + -khtml-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + filter: alpha(opacity = 80); + -moz-opacity: 0.8; + -webkit-opacity: 0.8; + -khtml-opacity: 0.8; + opacity: 0.8; +} \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/tooltip.js =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/tooltip.js 2015-03-25 17:01:23 UTC (rev 13022) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/tooltip.js 2015-03-25 23:37:10 UTC (rev 13023) @@ -9,13 +9,13 @@ */ +/* +this.tooltip = function(){ */ + /* CONFIG + yOffset = 20; */ -this.tooltip = function(){ - /* CONFIG */ - yOffset = 20; - /* END CONFIG */ - $(".tooltip").hover(function(e){ + /*$(".tooltip").hover(function(e){ this.t = this.title; this.title = ""; @@ -55,9 +55,9 @@ .css("top",(e.pageY + yOffset) + "px") .css("left",(e.pageX + xOffset) + "px"); }); -}; +};*/ // starting the script on page load $(document).ready(function(){ - tooltip(); + $('[data-toggle="tooltip"]').tooltip({ track: true }); }); \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_head.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_head.html 2015-03-25 17:01:23 UTC (rev 13022) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_head.html 2015-03-25 23:37:10 UTC (rev 13023) @@ -1,9 +1,9 @@ <div id="xo-logo-head"> <div id="main-logo"> - <a href="<{xoAppUrl admin.php}>" data-toggle="tooltip" data-original-title="<{$smarty.const._OXYGEN_ADMINISTRATION}>" title="<{$smarty.const._OXYGEN_ADMINISTRATION}>"></a> + <a href="<{xoAppUrl admin.php}>" title="<{$smarty.const._OXYGEN_ADMINISTRATION}>"></a> </div> <div id="xo-headnav"> - <a href="<{xoAppUrl}>" data-toggle="tooltip" data-original-title="<{$smarty.const._YOURHOME}>" title="<{$smarty.const._YOURHOME}>"><img src="<{xoImgUrl assets/img/home.png}>" alt="<{$smarty.const._YOURHOME}>"></a> - <a href="<{xoAppUrl user.php?op=logout}>" data-toggle="tooltip" data-original-title="<{$smarty.const._LOGOUT}>" title="<{$smarty.const._LOGOUT}>"><img src="<{xoImgUrl assets/img/logout.png}>" alt="<{$smarty.const._LOGOUT}>"></a> + <a href="<{xoAppUrl}>" title="<{$smarty.const._YOURHOME}>"><img src="<{xoImgUrl assets/img/home.png}>" alt="<{$smarty.const._YOURHOME}>"></a> + <a href="<{xoAppUrl user.php?op=logout}>" title="<{$smarty.const._LOGOUT}>"><img src="<{xoImgUrl assets/img/logout.png}>" alt="<{$smarty.const._LOGOUT}>"></a> </div> </div> \ No newline at end of file |
From: <txm...@us...> - 2015-03-25 17:01:32
|
Revision: 13022 http://sourceforge.net/p/xoops/svn/13022 Author: txmodxoops Date: 2015-03-25 17:01:23 +0000 (Wed, 25 Mar 2015) Log Message: ----------- Updated Fixed bugs default admin theme Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/style.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_footer.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_head.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_icons.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_modules.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_tabs.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_uptop.html Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/bootstrap-theme.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/bootstrap.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/fonts/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/fonts/glyphicons-halflings-regular.eot XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/fonts/glyphicons-halflings-regular.svg XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/fonts/glyphicons-halflings-regular.ttf XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/fonts/glyphicons-halflings-regular.woff XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/fonts/glyphicons-halflings-regular.woff2 XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/fonts/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/bootstrap.min.js Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/style.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/style.css 2015-03-23 15:22:16 UTC (rev 13021) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/style.css 2015-03-25 17:01:23 UTC (rev 13022) @@ -111,7 +111,6 @@ border-left-color:#cccccc; margin-top:5px; margin-right:-10px; - overflow: auto; } .dropdown-submenu:hover>a.submenu-after:after { Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/bootstrap-theme.min.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/bootstrap-theme.min.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/bootstrap-theme.min.css 2015-03-25 17:01:23 UTC (rev 13022) @@ -0,0 +1,5 @@ +/*! + * Bootstrap v3.3.2 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */.btn-danger,.btn-default,.btn-info,.btn-primary,.btn-success,.btn-warning{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-success.active,.btn-success:active,.btn-warning.active,.btn-warning:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-danger .badge,.btn-default .badge,.btn-info .badge,.btn-primary .badge,.btn-success .badge,.btn-warning .badge{text-shadow:none}.btn.active,.btn:active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc}.btn-default:focus,.btn-default:hover{background-color:#e0e0e0;background-position:0 -15px}.btn-default.active,.btn-default:active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default.disabled,.btn-default:disabled,.btn-default[disabled]{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-o-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#265a88));background-image:linear-gradient(to bottom,#337ab7 0,#265a88 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#245580}.btn-primary:focus,.btn-primary:hover{background-color:#265a88;background-position:0 -15px}.btn-primary.active,.btn-primary:active{background-color:#265a88;border-color:#245580}.btn-primary.disabled,.btn-primary:disabled,.btn-primary[disabled]{background-color:#265a88;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:focus,.btn-success:hover{background-color:#419641;background-position:0 -15px}.btn-success.active,.btn-success:active{background-color:#419641;border-color:#3e8f3e}.btn-success.disabled,.btn-success:disabled,.btn-success[disabled]{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:focus,.btn-info:hover{background-color:#2aabd2;background-position:0 -15px}.btn-info.active,.btn-info:active{background-color:#2aabd2;border-color:#28a4c9}.btn-info.disabled,.btn-info:disabled,.btn-info[disabled]{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:focus,.btn-warning:hover{background-color:#eb9316;background-position:0 -15px}.btn-warning.active,.btn-warning:active{background-color:#eb9316;border-color:#e38d13}.btn-warning.disabled,.btn-warning:disabled,.btn-warning[disabled]{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c12e2a));background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:focus,.btn-danger:hover{background-color:#c12e2a;background-position:0 -15px}.btn-danger.active,.btn-danger:active{background-color:#c12e2a;border-color:#b92c28}.btn-danger.disabled,.btn-danger:disabled,.btn-danger[disabled]{background-color:#c12e2a;background-image:none}.img-thumbnail,.thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#2e6da4;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-o-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f8f8f8));background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-o-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dbdbdb),to(#e2e2e2));background-image:linear-gradient(to bottom,#dbdbdb 0,#e2e2e2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-o-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#222));background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-o-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#080808),to(#0f0f0f));background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0}@media (max-width:767px){.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#b9def0));background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#f8efc0));background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-o-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#e7c3c3));background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f5f5f5));background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-o-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#286090));background-image:linear-gradient(to bottom,#337ab7 0,#286090 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#449d44));background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);background-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#31b0d5));background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#ec971f));background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c9302c));background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);background-repeat:repeat-x}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{text-shadow:0 -1px 0 #286090;background-image:-webkit-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2b669a));background-image:linear-gradient(to bottom,#337ab7 0,#2b669a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);background-repeat:repeat-x;border-color:#2b669a}.list-group-item.active .badge,.list-group-item.active:focus .badge,.list-group-item.active:hover .badge{text-shadow:none}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#d0e9c6));background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#c4e3f3));background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#faf2cc));background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-o-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#ebcccc));background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#e8e8e8),to(#f5f5f5));background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/bootstrap.min.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/bootstrap.min.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/bootstrap.min.css 2015-03-25 17:01:23 UTC (rev 13022) @@ -0,0 +1,5 @@ +/*! + * Bootstrap v3.3.2 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) @@ Diff output truncated at 100000 characters. @@ |
From: <and...@us...> - 2015-03-23 15:22:20
|
Revision: 13021 http://sourceforge.net/p/xoops/svn/13021 Author: andrey3761 Date: 2015-03-23 15:22:16 +0000 (Mon, 23 Mar 2015) Log Message: ----------- XOOPS 2.5.7.1: Russian translate added Added Paths: ----------- XoopsLanguages/russian/core/2.5.7/ XoopsLanguages/russian/core/2.5.7/checksum.php XoopsLanguages/russian/core/2.5.7/docs/ XoopsLanguages/russian/core/2.5.7/docs/README.txt XoopsLanguages/russian/core/2.5.7/docs/changelog.250.txt XoopsLanguages/russian/core/2.5.7/docs/changelog.txt XoopsLanguages/russian/core/2.5.7/docs/images/ XoopsLanguages/russian/core/2.5.7/docs/install.html XoopsLanguages/russian/core/2.5.7/docs/lang_diff.txt XoopsLanguages/russian/core/2.5.7/docs/license.txt XoopsLanguages/russian/core/2.5.7/extras/ XoopsLanguages/russian/core/2.5.7/extras/altsys_functions.txt XoopsLanguages/russian/core/2.5.7/extras/modules/ XoopsLanguages/russian/core/2.5.7/extras/modules/system/ XoopsLanguages/russian/core/2.5.7/extras/modules/system/language/ XoopsLanguages/russian/core/2.5.7/extras/modules/system/language/russian/ XoopsLanguages/russian/core/2.5.7/extras/modules/system/language/russian/admin/ XoopsLanguages/russian/core/2.5.7/extras/modules/system/language/russian/admin/filemanager.php XoopsLanguages/russian/core/2.5.7/htdocs/ XoopsLanguages/russian/core/2.5.7/htdocs/Frameworks/ XoopsLanguages/russian/core/2.5.7/htdocs/Frameworks/moduleclasses/ XoopsLanguages/russian/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/ XoopsLanguages/russian/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/ XoopsLanguages/russian/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/Frameworks/moduleclasses/moduleadmin/language/russian/main.php XoopsLanguages/russian/core/2.5.7/htdocs/class/ XoopsLanguages/russian/core/2.5.7/htdocs/class/mail/ XoopsLanguages/russian/core/2.5.7/htdocs/class/mail/phpmailer/ XoopsLanguages/russian/core/2.5.7/htdocs/class/mail/phpmailer/language/ XoopsLanguages/russian/core/2.5.7/htdocs/class/mail/phpmailer/language/phpmailer.lang-ru.php XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/ XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/ XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/language/ XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/dhtmltextarea/language/russian.php XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/textarea/ XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/textarea/language/ XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/textarea/language/russian.php XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/tinymce/ XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/tinymce/language/ XoopsLanguages/russian/core/2.5.7/htdocs/class/xoopseditor/tinymce/language/russian.php XoopsLanguages/russian/core/2.5.7/htdocs/images/ XoopsLanguages/russian/core/2.5.7/htdocs/images/icons/ XoopsLanguages/russian/core/2.5.7/htdocs/images/icons/delete.gif XoopsLanguages/russian/core/2.5.7/htdocs/images/icons/edit.gif XoopsLanguages/russian/core/2.5.7/htdocs/images/icons/pm.gif XoopsLanguages/russian/core/2.5.7/htdocs/images/icons/profile.gif XoopsLanguages/russian/core/2.5.7/htdocs/images/icons/reply.gif XoopsLanguages/russian/core/2.5.7/htdocs/install/ XoopsLanguages/russian/core/2.5.7/htdocs/install/language/ XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/finish.php XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/install.php XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/install2.php XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/mysql.lang.data.sql XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/style.css XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/support.php XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/support.png XoopsLanguages/russian/core/2.5.7/htdocs/install/language/russian/welcome.php XoopsLanguages/russian/core/2.5.7/htdocs/language/ XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/admin.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/auth.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/backend.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/banners.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/calendar.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/captcha.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/comment.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/countries.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/errors.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/findusers.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/formdhtmltextarea.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/global.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/locale.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/logger.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/ XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/activated.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/adminactivate.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/comment_notify.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/commentsubmit_notify.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/default_notify.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/index.html XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/lostpass1.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/lostpass2.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/register.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/tellfriend.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/mail_template/welcome.tpl XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/misc.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/notification.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/pmsg.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/search.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/style.css XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/timezone.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/uploader.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/user.php XoopsLanguages/russian/core/2.5.7/htdocs/language/russian/xoopsmailerlocal.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/language/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/language/russian/admin.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/language/russian/help/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/language/russian/help/help.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/language/russian/help/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/language/russian/main.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/pm/language/russian/modinfo.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/admin.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/help/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/help/help.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/help/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/mail_template/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/mail_template/emailchanged.tpl XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/mail_template/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/main.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/profile/language/russian/modinfo.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/protector/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/protector/language/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/protector/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/protector/language/russian/help/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/protector/language/russian/help/help.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/protector/language/russian/help/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/avatars.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/banners.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/blocksadmin.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/comments.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/groups.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/images.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/mailusers.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/maintenance.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/modulesadmin.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/preferences.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/smilies.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/tplsets.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/userrank.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin/users.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/admin.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/blocks.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/cpanel.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/avatars.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/banners.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/blocksadmin.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/comments.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/groups.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/help_center.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/images.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/mailusers.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/maintenance.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/module_index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/modulesadmin.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/preferences.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/smilies.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/tplsets.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/userrank.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/help/users.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/images/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/images/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/images/lightbox-blank.gif XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/images/lightbox-btn-close.gif XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/images/lightbox-btn-next.gif XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/images/lightbox-btn-prev.gif XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/images/lightbox-ico-loading.gif XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/language/russian/modinfo.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/default/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/default/img/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/default/img/xoops.ws.png XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/default/language/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/default/language/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/default/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/default/language/russian/admin.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/default/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/default/language/russian/localsupport.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/zetadigme/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/zetadigme/img/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/zetadigme/img/xoops.ws.png XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/zetadigme/language/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/zetadigme/language/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/zetadigme/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/zetadigme/language/russian/admin.php XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/zetadigme/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/modules/system/themes/zetadigme/language/russian/localsupport.php XoopsLanguages/russian/core/2.5.7/htdocs/themes/ XoopsLanguages/russian/core/2.5.7/htdocs/themes/suico/ XoopsLanguages/russian/core/2.5.7/htdocs/themes/suico/language/ XoopsLanguages/russian/core/2.5.7/htdocs/themes/suico/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/themes/suico/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/themes/suico/language/russian/main.php XoopsLanguages/russian/core/2.5.7/htdocs/themes/suico/language/russian/script.js XoopsLanguages/russian/core/2.5.7/htdocs/themes/suico/language/russian/style.css XoopsLanguages/russian/core/2.5.7/htdocs/themes/zetagenesis/ XoopsLanguages/russian/core/2.5.7/htdocs/themes/zetagenesis/language/ XoopsLanguages/russian/core/2.5.7/htdocs/themes/zetagenesis/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/themes/zetagenesis/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/themes/zetagenesis/language/russian/main.php XoopsLanguages/russian/core/2.5.7/htdocs/themes/zetagenesis/language/russian/script.js XoopsLanguages/russian/core/2.5.7/htdocs/themes/zetagenesis/language/russian/style.css XoopsLanguages/russian/core/2.5.7/htdocs/xoops_lib/ XoopsLanguages/russian/core/2.5.7/htdocs/xoops_lib/modules/ XoopsLanguages/russian/core/2.5.7/htdocs/xoops_lib/modules/protector/ XoopsLanguages/russian/core/2.5.7/htdocs/xoops_lib/modules/protector/language/ XoopsLanguages/russian/core/2.5.7/htdocs/xoops_lib/modules/protector/language/russian/ XoopsLanguages/russian/core/2.5.7/htdocs/xoops_lib/modules/protector/language/russian/admin.php XoopsLanguages/russian/core/2.5.7/htdocs/xoops_lib/modules/protector/language/russian/index.html XoopsLanguages/russian/core/2.5.7/htdocs/xoops_lib/modules/protector/language/russian/main.php XoopsLanguages/russian/core/2.5.7/htdocs/xoops_lib/modules/protector/language/russian/modinfo.php XoopsLanguages/russian/core/2.5.7/release_notes.txt XoopsLanguages/russian/core/2.5.7/upgrade/ XoopsLanguages/russian/core/2.5.7/upgrade/cnt-2.2.x-to-2.3.0/ XoopsLanguages/russian/core/2.5.7/upgrade/cnt-2.2.x-to-2.3.0/language/ XoopsLanguages/russian/core/2.5.7/upgrade/cnt-2.2.x-to-2.3.0/language/russian.php XoopsLanguages/russian/core/2.5.7/upgrade/language/ XoopsLanguages/russian/core/2.5.7/upgrade/language/russian/ XoopsLanguages/russian/core/2.5.7/upgrade/language/russian/style.css XoopsLanguages/russian/core/2.5.7/upgrade/language/russian/upgrade.php XoopsLanguages/russian/core/2.5.7/upgrade/upd-2.0.18-to-2.3.0/ XoopsLanguages/russian/core/2.5.7/upgrade/upd-2.0.18-to-2.3.0/language/ XoopsLanguages/russian/core/2.5.7/upgrade/upd-2.0.18-to-2.3.0/language/russian.php XoopsLanguages/russian/core/2.5.7.1/ XoopsLanguages/russian/core/2.5.7.1/docs/ XoopsLanguages/russian/core/2.5.7.1/docs/install.html XoopsLanguages/russian/core/2.5.7.1/extras/ XoopsLanguages/russian/core/2.5.7.1/extras/altsys_functions.txt XoopsLanguages/russian/core/2.5.7.1/extras/modules/ XoopsLanguages/russian/core/2.5.7.1/extras/modules/system/ XoopsLanguages/russian/core/2.5.7.1/extras/modules/system/language/ XoopsLanguages/russian/core/2.5.7.1/extras/modules/system/language/russian/ XoopsLanguages/russian/core/2.5.7.1/extras/modules/system/language/russian/admin/ XoopsLanguages/russian/core/2.5.7.1/extras/modules/system/language/russian/admin/filemanager.php XoopsLanguages/russian/core/2.5.7.1/htdocs/ XoopsLanguages/russian/core/2.5.7.1/htdocs/Frameworks/ XoopsLanguages/russian/core/2.5.7.1/htdocs/Frameworks/moduleclasses/ XoopsLanguages/russian/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/ XoopsLanguages/russian/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/Frameworks/moduleclasses/moduleadmin/language/russian/main.php XoopsLanguages/russian/core/2.5.7.1/htdocs/class/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/mail/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/mail/phpmailer/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/mail/phpmailer/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/mail/phpmailer/language/phpmailer.lang-ru.php XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/dhtmltextarea/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/dhtmltextarea/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/dhtmltextarea/language/russian.php XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/textarea/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/textarea/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/textarea/language/russian.php XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/tinymce/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/tinymce/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/class/xoopseditor/tinymce/language/russian.php XoopsLanguages/russian/core/2.5.7.1/htdocs/images/ XoopsLanguages/russian/core/2.5.7.1/htdocs/images/icons/ XoopsLanguages/russian/core/2.5.7.1/htdocs/images/icons/delete.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/images/icons/edit.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/images/icons/pm.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/images/icons/profile.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/images/icons/reply.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/install/ XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/finish.php XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/install.php XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/install2.php XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/mysql.lang.data.sql XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/style.css XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/support.php XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/support.png XoopsLanguages/russian/core/2.5.7.1/htdocs/install/language/russian/welcome.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/admin.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/auth.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/backend.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/banners.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/calendar.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/captcha.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/comment.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/countries.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/errors.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/findusers.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/formdhtmltextarea.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/global.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/locale.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/logger.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/ XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/activated.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/adminactivate.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/comment_notify.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/commentsubmit_notify.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/default_notify.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/lostpass1.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/lostpass2.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/register.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/tellfriend.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/mail_template/welcome.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/misc.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/notification.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/pmsg.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/search.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/style.css XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/timezone.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/uploader.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/user.php XoopsLanguages/russian/core/2.5.7.1/htdocs/language/russian/xoopsmailerlocal.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/language/russian/admin.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/language/russian/help/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/language/russian/help/help.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/language/russian/help/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/language/russian/main.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/pm/language/russian/modinfo.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/admin.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/help/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/help/help.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/help/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/mail_template/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/mail_template/emailchanged.tpl XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/mail_template/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/main.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/profile/language/russian/modinfo.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/protector/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/protector/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/protector/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/protector/language/russian/help/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/protector/language/russian/help/help.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/protector/language/russian/help/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/avatars.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/banners.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/blocksadmin.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/comments.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/groups.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/images.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/mailusers.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/maintenance.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/modulesadmin.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/preferences.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/smilies.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/tplsets.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/userrank.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin/users.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/admin.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/blocks.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/cpanel.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/avatars.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/banners.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/blocksadmin.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/comments.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/groups.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/help_center.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/images.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/mailusers.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/maintenance.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/module_index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/modulesadmin.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/preferences.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/smilies.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/tplsets.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/userrank.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/help/users.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/images/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/images/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/images/lightbox-blank.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/images/lightbox-btn-close.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/images/lightbox-btn-next.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/images/lightbox-btn-prev.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/images/lightbox-ico-loading.gif XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/language/russian/modinfo.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/default/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/default/img/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/default/img/xoops.ws.png XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/default/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/default/language/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/default/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/default/language/russian/admin.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/default/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/default/language/russian/localsupport.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/img/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/img/xoops.ws.png XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/russian/admin.php XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/modules/system/themes/zetadigme/language/russian/localsupport.php XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/suico/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/suico/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/suico/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/suico/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/suico/language/russian/main.php XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/suico/language/russian/script.js XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/suico/language/russian/style.css XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/xbootstrap/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/xbootstrap/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/xbootstrap/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/xbootstrap/language/russian/main.php XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/zetagenesis/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/zetagenesis/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/zetagenesis/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/zetagenesis/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/zetagenesis/language/russian/main.php XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/zetagenesis/language/russian/script.js XoopsLanguages/russian/core/2.5.7.1/htdocs/themes/zetagenesis/language/russian/style.css XoopsLanguages/russian/core/2.5.7.1/htdocs/xoops_lib/ XoopsLanguages/russian/core/2.5.7.1/htdocs/xoops_lib/modules/ XoopsLanguages/russian/core/2.5.7.1/htdocs/xoops_lib/modules/protector/ XoopsLanguages/russian/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/ XoopsLanguages/russian/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/russian/ XoopsLanguages/russian/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/russian/admin.php XoopsLanguages/russian/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/russian/index.html XoopsLanguages/russian/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/russian/main.php XoopsLanguages/russian/core/2.5.7.1/htdocs/xoops_lib/modules/protector/language/russian/modinfo.php XoopsLanguages/russian/core/2.5.7.1/upgrade/ XoopsLanguages/russian/core/2.5.7.1/upgrade/cnt-2.2.x-to-2.3.0/ XoopsLanguages/russian/core/2.5.7.1/upgrade/cnt-2.2.x-to-2.3.0/language/ XoopsLanguages/russian/core/2.5.7.1/upgrade/cnt-2.2.x-to-2.3.0/language/russian.php XoopsLanguages/russian/core/2.5.7.1/upgrade/language/ XoopsLanguages/russian/core/2.5.7.1/upgrade/language/russian/ XoopsLanguages/russian/core/2.5.7.1/upgrade/language/russian/style.css XoopsLanguages/russian/core/2.5.7.1/upgrade/language/russian/upgrade.php XoopsLanguages/russian/core/2.5.7.1/upgrade/upd-2.0.18-to-2.3.0/ XoopsLanguages/russian/core/2.5.7.1/upgrade/upd-2.0.18-to-2.3.0/language/ XoopsLanguages/russian/core/2.5.7.1/upgrade/upd-2.0.18-to-2.3.0/language/russian.php Added: XoopsLanguages/russian/core/2.5.7/checksum.php =================================================================== --- XoopsLanguages/russian/core/2.5.7/checksum.php (rev 0) +++ XoopsLanguages/russian/core/2.5.7/checksum.php 2015-03-23 15:22:16 UTC (rev 13021) @@ -0,0 +1,70 @@ +<?php +/** +* XOOPS installation md5 checksumminig script +* +* This script allows you to check that the XOOPS system files have been correctly uploaded. +* It reads all the XOOPS files and reports missing or invalid ones. +* +* Instructions: +* - Upload this script and xoops.md5 to your XOOPS documents root +* - Access it using a browser +* - Re-upload missing/invalid files +* +* @copyright The XOOPS Project http://xoops.sf.net/ +* @license http://www.fsf.org/copyleft/gpl.html GNU public license +* @author Skalpa Keo <sk...@xo...> +* @author phppp <ph...@us...> +* @since 2.0.14 +* @version $Id $ +* @package xoops +*/ + +error_reporting( 0 ); + +header( "Content-type: text/plain" ); + +$md5_file = "./checksum.md5"; +$root = ( is_dir("./htdocs") ? "./htdocs" : "." ); +if ( isset($_GET["root"]) && false === strpos($_GET["root"], "..") ) { + $root .= "/" . $_GET["root"]; + $md5_file = "./checksum.".str_replace("/", "-", $_GET["root"]).".md5"; +} +$num_files = check_folder($root); + +echo "There are {$num_files} files checked.\n"; +echo "Please remove the file $md5_file and ".basename(__FILE__)." as soon as possible.\n"; + +function check_file ($line, $path = ".") +{ + list( $file, $sum ) = explode( ":", $line, 2 ); + if ( substr( $file, 0, 7 ) == 'htdocs/' ) { + $file = substr( $file, 7 ); + } else { + $file = $path."/".$file; + } + if ( !file_exists( $file ) ) { + echo "$file missing !\n"; + } else { + $txt = file_get_contents( "$file" ); + $txt = str_replace( array( "\r\n", "\r" ), "\n", $txt ); + if ( md5($txt) != $sum ) { + echo "$file content invalid\n"; + } + } +} + +function check_folder( $path = '.', $recursive = false ) { + global $md5_file; + $num_files = 0; + if ( !is_file( $md5_file ) || !is_readable( $md5_file ) ) { + echo "$md5_file file not found.\n"; + return false; + } + $sums = explode( "\n", rtrim( file_get_contents( $md5_file ) ) ); + foreach ( $sums as $line ) { + check_file ($line, $path); + $num_files ++; + } + + return $num_files; +} Added: XoopsLanguages/russian/core/2.5.7/docs/README.txt =================================================================== --- XoopsLanguages/russian/core/2.5.7/docs/README.txt (rev 0) +++ XoopsLanguages/russian/core/2.5.7/docs/README.txt 2015-03-23 15:22:16 UTC (rev 13021) @@ -0,0 +1,20 @@ +XOOPS 2.5.5 Final + +The XOOPS Development Team is pleased to announce the release of XOOPS 2.5.5 Final. Several bugs have been fixed as well as security enhancement based on report from High-Tech Bridge Security Research Lab. + +This 2.5 series builds on the XOOPS 2.4.x series with objectives of usability improvements instead of architecture or API changes. +The system module is updated with a major redesign with jQuery based AJAX, done mainly by ForMusS, kraven_30, Mage with contributions from trabis, voltan, Kris_fr, onokazu etc. +Besides usability, some proof-of-concept experiments have also been proven for module and theme development. Unavoidably there are bugs and incompatibility introduced. + +Download XOOPS 2.5.5 from [url=https://sourceforge.net/projects/xoops/files/XOOPS%20Core%20%28stable%20releases%29/XOOPS%202.5.5/]Sourceforge repository[/url]. + + +How to contribute +----------------------------------- +Bug report: http://sourceforge.net/tracker/?group_id=41586&atid=430840 +Patch and enhancement: http://sourceforge.net/tracker/?group_id=41586&atid=430842 +Feature design: http://sourceforge.net/tracker/?group_id=41586&atid=430843 +Release announcement: https://lists.sourceforge.net/lists/listinfo/xoops-announcement + +XOOPS Development Team +April 15th, 2012 \ No newline at end of file Added: XoopsLanguages/russian/core/2.5.7/docs/changelog.250.txt =================================================================== --- XoopsLanguages/russian/core/2.5.7/docs/changelog.250.txt (rev 0) +++ XoopsLanguages/russian/core/2.5.7/docs/changelog.250.txt 2015-03-23 15:22:16 UTC (rev 13021) @@ -0,0 +1,668 @@ +XOOPS 2.5.x Changelog (Language changes: see: /docs/lang_diff.txt) + +=============================== +2012/04/15: Version 2.5.5 Final +=============================== +Bugfixes: + - preventing division by zero in pagenav.php (timgno) + - ID: 3466534 tooltip "$ not defined" fix (culex) + - ID: 3513787 wrong cookie_domain (arion92fr) + - ID: 3518291 Fix of variables assigned by reference in formelementtray (mamba) + - problem in formtextdateselect (wishcraft) + +Updated: + - phpThumb to 1.7.11 (mamba) + - jGrowl to 1.2.6 (mowaffaq/mamba) + +=============================== +2012/03/14: Version 2.5.5 RC +=============================== +Bugfixes: + - ID: 3494895 When changing the # of visible entries in Protector, it goes to Admin (jcweb/mamba) + - ID: 3494894 Calendar shows 40 days (peekay/mage) + - ID: 3494896 Image Manager category creation restrictions (voltan/mage) + - ID: 3494893 PM Messages deleted from Saved box (Danielw42/mage) + - ID: 3501897 Protector errors (cesag/XavierS) + - ID: 3511204 TinyEditor only loading in the 'Scoop' part of the News module (peekay/XavierS) + - ID: 3511205 Bug in fresh install in page_configsave.php (XavierS) + +Improved: + - replacing "msnbot" with "bingbot" in Protector (mamba) + +Updated: + - HTML Purifier to 4.4.0 (mamba) + - TinyMCE to 3.4.9 (mamba) + - jQuery to 1.72 (mamba) + - jQueryUI to version 1.8.18 (mamba) + +=============================== +2012/02/19: Version 2.5.5 Beta +=============================== +Security fixes: + - XSS (Cross Site Scripting) vulnerability in PM module and tinymce (High-Tech Bridge Security Research Lab/trabis) + +Bugfixes: + - Templates Manager does not handle single quotes correctly (trabis) + - $xoTheme->addScript('', '', 'content here'); causes duplicate CDATA on cached pages (wishcraft/trabis) + - System admin maintenance table names are incorrect if db_prefix length is not 4 (trabis) + - System admin users advance search displays wrong results when using 'contains' or 'equal' in some fields (trabis) + - System admin users pagination not working correctly for some fields (trabis) + - System admin users blank page when site as many users (trabis) + - /class/object.php deprecated message, should be /class/xoopsobject.php (mamba/trabis) + - /class/module.php deprecated message, should be /class/xoopsmodule.php (mamba) + - /class/user.php deprecated message, should be /class/xoopsuser.php (mamba) + - ID: 3443381 Images stored in database not given correctly in edit mode (mage) + - ID: 3201929 Change upper limit for Banner impressions (mamba/mage) + - ID: 3432275 html structure (kris_fr/mage) + - ID: 3461539 Incorrect value for setOrder() in modulesadmin/main.php (mage) + - ID: 3469896 When deleting client, it doesn't delete finished banners (mamba/mage) + - ID: 3442270 Date format and Xoops 2.5.4 (cesag/formuss) + +Improved: + - Add key 'uid' on 'groups_users_link' table to allow joining 'users' table with better performance (trabis) + - Add Comments, Templates, and Uninstall links to Module's Admin (mamba) + +Updated: + - TinyMCE to 3.4.8 (mamba) + - jQuery to 1.71 (mamba) + - jQueryUI to version 1.8.17 (mamba) + - PhpMailer to version 5.2.1 (mamba) + +=============================== +2011/11/20: Version 2.5.4 Final +=============================== +Bugfixes: + - ID: 3430112 Java problem in xoops editor (voltan/mamba/trabis) + - dhtml smilie is always inserted in the end (mamba/trabis) + - tinymce using body background color (trabis) + - jquery ui css no loaded correctly on admin side (trabis) + - ID: 3432017 HTML tags not closed (kris_fr/mamba) + +Updated: + - updated jQuery to 1.7 (mamba) + +=============================== +2011/10/10: Version 2.5.4 RC +=============================== +Bugfixes: + - quoteConv causing problems with large number of quotes (Roby73/trabis) + - Cache bug. The key's not generated correctly (andrey3761/trabis) + - ID: 3425970 Unknown: Function split() (cesag/trabis) + - ID: 3424295 Undefined index: tplset (cesag/trabis) + - Preferences not using description field correctly, tooltip showing title and description without space (trabis) + - Extra height in admin page when warnings are not displayed (timgno/trabis) + - Files loaded with browse.php (*.js, *.css, etc) are not cached by the browser (trabis) + - ID: 3421180 CBB 4.05 and Xoops 2.5.4 error with Framework (cesag/trabis) + +Improved: + - Replacing deprecated Database::getInstance(); calls with XoopsDatabaseFactory::getDatabaseConnection(); (trabis) + - Logging deprecated methods and files that will be removed on XOOPS 2.6.0 (trabis) + +=============================== +2011/10/05: Version 2.5.4 Beta +=============================== +Bugfixes: + - Remove a call of non existing css file in admin menu + - ID: 3419812 Drag and drop Xoops 2.5.3 bug (cesag/trabis) + - Calendar form element does not work properly (trabis) + - Make sure xoops_data/data is writable during install (trabis) + - ID: 3419332 Logout bug (cesag/trabis) + +Updated: + - Update jQueryUI to version 1.8.16 (voltan) + - Update tinymce to version 3.4.6 (ForMuss) + - Update PhpMailer to version 5.1 (dhsoft) + - Update jQuery o version 1.6.4 (ForMuss) + - Update Core modules (PM, Profile, Protector) to ModuleAdmin GUI (mamba) + +Deleted: + - Delete xoops_lib/data/secure.php file for exclude update error + +=============================== +2011/10/03: Version 2.5.3 +=============================== +Bugfixes: + - Style switcher does not work on default admin GUI(trabis) + - Reverting fix for bug ID: 2672723 Changed the code in Install to omits the SQL command: "ALTER DATABASE ... CHARACTER SET ..." (trabis) + +=============================== +2011/09/29: Version 2.5.2 Final +=============================== +Bugfixes: + - ID: 3416069 - avatars upload problem (cesag/trabis) + - MyTextSanitizer::htmlSpecialChars() using UTF-8 by default (trabis) + - System Waiting block produces queries for inactive modules (trabis) + - 'Selected modules does not exist' if using inactive module on startpage (trabis) + +=============================== +2011/09/06: Version 2.5.2 RC +=============================== +Security fixes: + - Removed support for script driven images!!! (High-Tech Bridge Security Research Lab/trabis) + - Fixed XSS (Cross Site Scripting) vulnerability in /include/formdhtmltextarea_preview.php (High-Tech Bridge Security Research Lab/trabis) +Bugfixes: + - Protector Module - Added stopforumspam option (trabis) + - Modules admin does not show update warning for modules that have no main. (trabis) + - ID: 3411696 custom avatar is not deleted after user change avatar (sabahan) + - XoopsCaptcha does not load captcha configs correctly (trabis) + - XoopsCaptcha is not allowing the use of Frameworks folder (trabis) + - XoopsCaptcha(Method) is not extensible enough, can't add new captcha methods without hacking (trabis) + - ID: 2909799 Unbalanced [quote] introduces unbalanced <div> tag (ghia/trabis) + - ID: 2704039 backend.php does not work in 2.3.3 (drieben/trabis) + - ID: 3026492 Xoops Forms using Single Quotes For Html tags (catzwolf/trabis) + - ID: 3000518 Required fields for registration are not always enforced(csware/trabis) + - ID: 2795050 user profile Bug (zaza123/trabis) + - ID: 3014493 SQL structure duplicates wrongly PM module table (ghia/mamba) + - ID: 3139081 xoops_error displays array dump (madreus/trabis) + - ID: 2937966 Reusing loop variable in preferences (ghia/trabis) + - ID: 2843028 Bug fonction "checkRight" class XoopsGroupPerm (mageg/trabis) + - ID: 2827946 Required list message doesn't appear (daviddu54/trabis) + - cleanVars() does not enforce array() on vars of type 'array' (trabis) + - XoopsUserUtility::validate() {$uid} not set in query (trabis) + - ID: 3410742 Broken Message Icon Image for core pm. (sabahan/Mamba) + - ID: 2672723 Changed the code in Install to omits the SQL command: "ALTER DATABASE ... CHARACTER SET ..." if it's not needed. (bs_php) + - ID: 1988039 does not accept some valid email addresses (anderssk/trabis) + - ID: 1889743 Installation of module fails if SQL file ends with a comment (ojobazos/trabis) + - ID: 1811479 Showing the right block in the wrong place: Top page wrong d (nachenko/trabis) + - ID: 3409728 PM Module : Missing message icon in readpmsg.php (sabahan/Mamba) + - ID: 3409391 From module condition check error in pmlite.php (zyspec) + - ID: 2959764 Path with spaces causes bad login redirect (bhardie/trabis) + - ID: 2843027 Bug class criteria GroupBy (mageg/trabis) + - $block = new XoopsBlock($id); not assigning block vars. (trabis) + - ID: 3403521 System Block Class, getContent var case inconsistency (zyspec/trabis) + - ID: 2956172 Internet Explorer 8 and Alt-attribute (drieben/mamba) + - ID: 3408962 theme set during install & register (sabahan/formuss) + - ID: 3408955 comment display mode standardization (sabahan/formuss) + - ID: 3288975 javascript calendar date format localization (ianez/formuss) + - ID: 3059263 Word Censoring Options not work (trabis) + - ID: 3408572 zetadigme admin gui - top banner bug (sabahan) + - ID: 3090520 class xoopsform default date (philou_themes) + - ID: 3408236 PM Module - Missing Message Icon selector (sabahan/Mamba) + - ID: 2340215 Not possible to use URL link in images (marcoxoops/Mamba) + - ID: 3406494 Geshi support in textsanitizer, syntaxhighlight incomplete (zyspec/trabis) + - ID: 3074089 XoopsModelSync, synchronization method always returns true (zyspec/Formuss) + - ID: 3404935 Avatar for new users is set to 'blank.gif' (trabis/Formuss) + - ID: 3407347 Somewhat weird for the xoops_data, xoops_lib directory (trabis) + - ID: 3404306 message is delete directly no confirmation yes or no (trabis) + - ID: 3383092 Cache problems with Stylesheets (trabis) + - ID: 3406326 Setting of Message image not implemented in Core pmlite.php (Mamba) + - ID: 3406244 Read/Unread PM Module indicator in Core (sabahan/Mamba) + - ID: 3197093 formcheckbox.php validation not working in xoops 2.5.1a (Satrebil/trabis) + - ID: 2952506 Read/Unread PM Module indicator (sarahmx/Mamba) + - ID: 3404307 read and unread pm icon (Sabahan/Mamba) + - ID: 3404000 display of empty profile field (sabahan/trabis) + - ID: 3403568 avatar problem (sabahan/Formuss) + - ID: 3291912 multilanguage Language Issue (sabahan/Formuss) + - ID: 3241757 Module Update Error Messages (zyspec/Formuss) + - ID: 3400039 When module is deactivated, blocks are still active (Mamba/Formuss) + - ID: 3252445 Setting avatar display "off" in System Avatar has no effect (Mamba/Formuss) + - ID: 2482129 Huge number of files created in /smarty_cache (trabis) + - ID: 3109230 Cloned template are not accessible (Drieben/Formuss) + - ID: 3288284 Uninitialized variable in gui.php (Mamba/Formuss) + - ID: 3252474 Missing "Delete" action icon on Custom Avatars (Mamba/Formuss) + - Fix an error for display admin template (Mage/Formuss) + - Activate/Deactivate module was not updating xoops_active_modules cache file(trabis) + - ID: 3273466 Banner : Add new advertiser (Tatane/Formuss) +Added: + - Added renderValidationJS() for captcha (trabis) + - Recaptcha catpcha support (ghia/DhSoft/trabis) + - Preview button for blocks (trabis) + - "admin_warnings_enable" option in xoops_data/configs/xoopsconfig.php (trabis) + - Preload event 'checkcache' on header.php to allow disable caching on specific conditions (trabis) + - XoopsObject::getVar() case 'n' for XOBJ_DTYPE_ARRAY/XOBJ_DTYPE_UNICODE_ARRAY to allow getting raw value (trabis) +Improved: + - Changed "debugLevel" default option to 2(admins only) in xoops_data/configs/xoopsconfig.php(trabis) + - XoopsGroupPermHandler::getRight() as new parameter $trueifadmin to allow modules to set admin permissions (trabis) + - subject icons in private messages to be set by sender and not by the system (mamba) + - Blocks admin using cookies to save select boxes status (trabis) + - Moved js and css from xo_scripts template into gui class(using $xoTheme) to avoid module conflicts + - require class/xoopslocal.php causing problems with RMCommon (mamba/trabis) + +=============================== +2011/04/12: Version 2.5.2 Beta +=============================== +Bugfixes: + - Module names and orders were not able to update (phppp/aitor) + - Custom block was not able to add due to missing of 'block_type' (phppp/tatane/mr-reda04_fr/aitor) + - System avatars not set in DB (voltan) + - Improved translations (phppp/mamba) + + +=============================== +2011/03/23: Version 2.5.1 Final +=============================== +Bugfixes: + - ID: 3219412 Block Cloning : parent module (mid) not saved when cloning(trabis) + - ID: 3219408 Block management : data not saved when editing(trabis) + - ID: 3229007 Setting # of banner impressions has no effect(trabis) + + +=============================== +2011/03/15: Version 2.5.1 RC +=============================== +Updates: + - Updated suico and zetagenesis themes, zetadigme system admin theme (kris_fr) + +=============================== +2011/03/15: Version 2.5.1 RC +=============================== +Security improvements: + - Added filters to output data to avoid potential XSS (phppp/Aung Khant) +Updates: + - Update zetadigme admin gui (kris_fr) + - New MIME types (mojtabajml/kris_fr) + - Update jquery and jquery ui to last version (voltan) + - Fix bug in help page url in modules/system/class/gui.php (voltan) + - Add image URL show option in Image Manager (voltan) +Bugfixes: + - ID: 3168899 Module weight Arrangment bug, change order only for visible blocks (trabis) + - ID: 3167970 Banner edit generates a new banner(trabis) + - ID: 3153597 Banner management: URL click mandatory(trabis) + - ID: 3111137 Module Block is cloned as custom block(trabis) + + +=============================== +Updated 2010/10/23: Version 2.5.0 +=============================== +Bug Fixes: + + - Fix security bug in Profile (gaba/phppp) + - Fix save in edit avatar and change path to avatar in form (formuss) + - include jQuery in admin page (formuss) + - Fix: Banners - "add" buttons disappear after deleting all banners. (trabis) + - Fix: Banners - Blank page when deleting clients. (trabis) + - Fix: Impossible to edit a user if uname contains a ', it shows uname already taken. (trabis) + - Fix: Some user defines(Error messages) were placed in blocks language file! They were moved to user language file and renamed. (trabis) + - Fix: Impossible to "delete" or "update groups" of selected users. Table sorting does not work with select fields! Table sorting was disabled for now. Also, the action for deleting users was not matching the action requested by the submit form. + - Improving fix for "Arbitrary file deletion" reported by Ono. Make sure file is inside "themes" directory. (onokazu/trabis) + - Fixing Xss attack, and possible sql injections on admin user page(reported by Ono).. (onokazu/trabis) + - Added 3 language constants for interest, occupation and location for usage on "search user" page. . (trabis) + - Altered 3 language constants for interest, occupation and location used on "add/edit user" page.. (trabis) + - Fixed error messages constants that were using old definitions. . (trabis) + - Fixing "full path disclosure" (onokazu/trabis) + - Fix an error when we commit with blank.gif (formuss) + - Add default image for avatar (formuss) + - Clean variables passed by submit (formuss) + - Add case in clean variable function (formuss) + - Load english language as default (formuss) + - Fix errors with _AM_SYSTEM_DBUPDATED define in sub file (formuss) + - Fix an error on banners client deletion (formuss) + - Fix banners error on search client name (formuss) + - Fix an error when add smilies with existing file (formuss) + - Fix banners error on search client name (formuss) + - Fix an error when add smilies with existing file (formuss) + - Fix an error with IE (formuss) + - Fix problem for changing module name (formuss) + - ID: 3089455 (wrong width in Profile Style.css) (Mamba) + - ID: 3081037 (Updated PHP & MySQL requirementes) (Anderssk/Mamba) + - ID: 3089251 (Checkboxes in Block Accees not working) (Mamba/Formuss) + - ID: 3085003 (Info buttons not linked) (Mamba/Formuss) + - ID: 3084587 (Typo in xmlrpc.php) (Wishcraft/Mamba) + - ID: 3000221 (TYPE=MyISAM replaced by ENGINE=MyISAM) (Ghia/Mamba) + - Division by zero in banners.php (trabis) + - $myts not defined in banners.php (trabis) + - function xoops_getbanner() may delete a newly created banner (trabis) + - ID: 3060263([code] still translate to double <code> tags in 2.4.5 Final/madreus)(trabis) + - Templates that use xoAppUrl or xoImgUrl (themes/default/modules/system/system_redirect.html, etc) do not compile correctly during module update (trabis) + - XOOPS_SYSTEM_COMMENT not defined, comment permissions not working correctly (trabis) + - Banner count being incremented in admin pages and twice for redirect pages (trabis) + - ID: 2153663 (Preview function/anderssk) (trabis) + - ID: 2929230 (DHTML AJAX can tackle server/ghia) (trabis) + - ID: 3033138 (XoopsLists::getHtmlList method needs updating/zyspec) (trabis) + - ID: 3023820 (Error in folder class/formuss) (trabis/formuss) + - XoopsFormDhtmlTextArea validation not working (trabis) + - Removing file class/xoopsform/formtree.php, class is not working and not following Xoops naming conventions (trabis) + +Design Fixes: + - update legacy admin gui (change link in header) - xoops 2.5.0 (kris_fr) + - correction of image links and cleaning css code in legacy admin gui (kris_fr) + - correction and cleaning css code and deleting unused images in installer (kris_fr) + - correction define language, cleaning css code and deleting unused files in zetadigme admin gui (kris_fr) + - fix tooltips in zetadigme admin gui (kris_fr) + - design templa... [truncated message content] |
From: <txm...@us...> - 2015-03-19 19:09:35
|
Revision: 13020 http://sourceforge.net/p/xoops/svn/13020 Author: txmodxoops Date: 2015-03-19 19:09:25 +0000 (Thu, 19 Mar 2015) Log Message: ----------- Updated Fixed bugs Fixed responsive for mobiles Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/language/english/admin/blocksadmin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/style.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/bootnewage.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/italian/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_header.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/include/defines.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/class/block.php Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/include/defines.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/include/defines.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/include/defines.php 2015-03-19 19:09:25 UTC (rev 13020) @@ -0,0 +1,123 @@ +<?php +/** + * XOOPS constansts + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package kernel + * @since 2.0.0 + * @version $Id: defines.php 12033 2013-09-14 03:16:44Z beckmi $ + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +/** + * Define required Defines (I guess lol ) + */ +define('XOOPS_SIDEBLOCK_LEFT', 0); +define('XOOPS_SIDEBLOCK_RIGHT', 1); +define('XOOPS_SIDEBLOCK_BOTH', 2); +define('XOOPS_CENTERBLOCK_LEFT', 3); +define('XOOPS_CENTERBLOCK_RIGHT', 4); +define('XOOPS_CENTERBLOCK_CENTER', 5); +define('XOOPS_CENTERBLOCK_ALL', 6); +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_RIGHT', 11); +define('XOOPS_FOOTERBLOCK_CENTER', 12); +define('XOOPS_FOOTERBLOCK_ALL', 13); + +define('XOOPS_BLOCK_INVISIBLE', 0); +define('XOOPS_BLOCK_VISIBLE', 1); +define('XOOPS_MATCH_START', 0); +define('XOOPS_MATCH_END', 1); +define('XOOPS_MATCH_EQUAL', 2); +define('XOOPS_MATCH_CONTAIN', 3); +// YOU SHOULD AVOID USING THE FOLLOWING CONSTANTS, THEY WILL BE REMOVED +define('XOOPS_THEME_PATH', XOOPS_ROOT_PATH . '/themes'); +define('XOOPS_ADMINTHEME_PATH', XOOPS_ROOT_PATH . '/modules/system/themes'); +define('XOOPS_UPLOAD_PATH', XOOPS_ROOT_PATH . '/uploads'); +define('XOOPS_LIBRARY_PATH', XOOPS_ROOT_PATH . '/libraries'); +define('XOOPS_THEME_URL', XOOPS_URL . '/themes'); +define('XOOPS_ADMINTHEME_URL', XOOPS_URL . '/modules/system/themes'); +define('XOOPS_UPLOAD_URL', XOOPS_URL . '/uploads'); +define('XOOPS_LIBRARY_URL', XOOPS_URL . '/libraries'); + +// ----- BEGIN: Deprecated, move to template class ----- +// define('SMARTY_DIR', XOOPS_ROOT_PATH . '/class/smarty/'); +define('XOOPS_COMPILE_PATH', XOOPS_VAR_PATH . '/caches/smarty_compile'); +define('XOOPS_CACHE_PATH', XOOPS_VAR_PATH . '/caches/xoops_cache'); +// ----- END: Deprecated, move to template class ----- + +if (!defined('XOOPS_XMLRPC')) { + define('XOOPS_DB_CHKREF', 1); +} else { + define('XOOPS_DB_CHKREF', 0); +} + +/** + * User Mulitbytes + */ +// if ( !defined( 'XOOPS_USE_MULTIBYTES' ) ) { +// define('XOOPS_USE_MULTIBYTES', 0 ); +// } + +// IT IS A WRONG PLACE FOR THE FOLLOWING CONSTANTS +/* + * Some language definitions that cannot be translated + */ +define('_XOOPS_FATAL_MESSAGE', "<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'> +<html xmlns='http://www.w3.org/1999/xhtml'> +<head> +<meta http-equiv='Content-Type' content='text/html; charset=utf-8;charset=utf-8' /> +<title>Internal server error</title> +<style type='text/css'> +* { margin: 0; padding: 0; font-family: Arial, Helvetica, sans-serif;} +body {font-size: 12px; background-color: #f0f0f0; text-align: center;} +#xo-siteblocked { + border: 1px solid #c0c4c0; + width: 375px; + height: 318px; + margin: 150px auto; + text-align: center; + background-color: #fff; + background-image: url(images/img_errors.png); + background-repeat: no-repeat; + background-position: 30px 50px; + padding-left: 300px; + padding-right: 30px; + border-radius: 15px; + -moz-border-radius: 15px; + -webkit-border-radius: 15px; +} + #xo-siteblocked h1 {font-size: 1.7em; margin: 45px 0 30px 0;} + #xo-siteblocked h2 {font-size: 1.5em; margin: 0 0 30px 0;} + #xo-siteblocked h1, h2 {font-weight: normal; text-shadow: 1px 1px 2px #ccc;} + #xo-siteblocked a, #xo-siteblocked a:visited {color: #2cb0ff; text-decoration: none;} + #xo-siteblocked p { font-size: 1.3em; margin-top: 12px; line-height: 2em;} + #xo-siteblocked p.xo-siteblocked-message { height: 70px;} + #xo-siteblocked p.xo-siteblocked-desc { font-size: .9em; font-style: italic; margin-top: 25px;} +</style> +</head> +<body> + <div id='xo-siteblocked'> + <h1>A problem has occurred on our server!</h1> + <h2>Page is currently unavailable</h2> + <p class='xo-siteblocked-message'>We are working on a fix<br /><a href='/'>Please come back soon ...</a></p> + <p class='xo-siteblocked-desc'>Error : %s</p> + </div> +</body> +</html>" +); + +define('_XOOPS_FATAL_BACKTRACE', "Backtrace"); Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/class/block.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/class/block.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/class/block.php 2015-03-19 19:09:25 UTC (rev 13020) @@ -0,0 +1,620 @@ +<?php +/** + * Block Class Manager +* + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package system + * @version $Id: block.php 12868 2014-11-23 20:41:51Z txmodxoops $ + */ +// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined'); + +require_once XOOPS_ROOT_PATH . '/kernel/block.php'; + +/** + * System Block + * + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @package system + */ +class SystemBlock extends XoopsBlock +{ + /** + * + */ + function __construct() + { + parent::__construct(); + } + + /** + * @param string $mode + * + * @return XoopsThemeForm + */ + function getForm($mode='edit') + { + if ($this->isNew()) { + $title = _AM_SYSTEM_BLOCKS_ADDBLOCK; + $modules = array(-1); + $groups = array( XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS, XOOPS_GROUP_ADMIN ); + $this->setVar('block_type', 'C'); + $this->setVar('visible',1); + $op = 'save'; + } else { + // Search modules + $blocklinkmodule_handler =& xoops_getmodulehandler('blocklinkmodule'); + $criteria = new CriteriaCompo(new Criteria('block_id', $this->getVar('bid') )); + $blocklinkmodule = $blocklinkmodule_handler->getObjects($criteria); + foreach ($blocklinkmodule as $link) { + $modules[] = $link->getVar('module_id'); + } + // Saerch perms + $groupperm_handler =& xoops_gethandler('groupperm'); + $groups =& $groupperm_handler->getGroupIds('block_read', $this->getVar('bid')); + switch ($mode) { + case 'edit': + $title = _AM_SYSTEM_BLOCKS_EDITBLOCK; + break; + case 'clone': + $title = _AM_SYSTEM_BLOCKS_CLONEBLOCK; + $this->setVar('bid', 0); + if ( $this->isCustom() ) { + $this->setVar('block_type', 'C'); + } else { + $this->setVar('block_type', 'D'); + } + break; + } + $op = 'save'; + } + $form = new XoopsThemeForm($title, 'blockform', 'admin.php', 'post', true); + if (!$this->isNew()) { + $form->addElement(new XoopsFormLabel(_AM_SYSTEM_BLOCKS_NAME, $this->getVar('name'))); + } + // Side position + $side_select = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_TYPE, 'side', $this->getVar('side')); + $side_select->addOptionArray(array( + 0 => _AM_SYSTEM_BLOCKS_SBLEFT, + 1 => _AM_SYSTEM_BLOCKS_SBRIGHT, + 3 => _AM_SYSTEM_BLOCKS_CBLEFT, + 4 => _AM_SYSTEM_BLOCKS_CBRIGHT, + 5 => _AM_SYSTEM_BLOCKS_CBCENTER, + 7 => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT, + 8 => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT, + 9 => _AM_SYSTEM_BLOCKS_CBBOTTOM, + 10 => _AM_SYSTEM_BLOCKS_CBFOOTERLEFT, + 11 => _AM_SYSTEM_BLOCKS_CBFOOTERRIGHT, + 12 => _AM_SYSTEM_BLOCKS_CBFOOTERCENTER)); + + $form->addElement($side_select); + // Order + $form->addElement(new XoopsFormText(_AM_SYSTEM_BLOCKS_WEIGHT, 'weight', 2, 5, $this->getVar('weight'))); + // Display + $form->addElement(new XoopsFormRadioYN(_AM_SYSTEM_BLOCKS_VISIBLE, 'visible', $this->getVar('visible'))); + // Visible In + $mod_select = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_VISIBLEIN, 'modules', $modules, 5, true); + $module_handler =& xoops_gethandler('module'); + $criteria = new CriteriaCompo(new Criteria('hasmain', 1)); + $criteria->add(new Criteria('isactive', 1)); + $module_list = $module_handler->getList($criteria); + $module_list[-1] = _AM_SYSTEM_BLOCKS_TOPPAGE; + $module_list[0] = _AM_SYSTEM_BLOCKS_ALLPAGES; + ksort($module_list); + $mod_select->addOptionArray($module_list); + $form->addElement($mod_select); + // Title + $form->addElement(new XoopsFormText(_AM_SYSTEM_BLOCKS_TITLE, 'title', 50, 255, $this->getVar('title')), false ); + if ($this->isNew() || $this->isCustom()) { + $editor_configs=array(); + $editor_configs["name"] ="content_block"; + $editor_configs["value"] = $this->getVar('content', 'e'); + $editor_configs["rows"] = 20; + $editor_configs["cols"] = 100; + $editor_configs["width"] = "100%"; + $editor_configs["height"] = "400px"; + $editor_configs["editor"] = xoops_getModuleOption('blocks_editor', 'system'); + $form->addElement(new XoopsFormEditor(_AM_SYSTEM_BLOCKS_CONTENT, "content_block", $editor_configs), true); + if ( in_array( $editor_configs["editor"], array('dhtmltextarea','textarea' ) ) ) { + $ctype_select = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'c_type', $this->getVar('c_type')); + $ctype_select->addOptionArray(array( + 'H' => _AM_SYSTEM_BLOCKS_HTML, + 'P' => _AM_SYSTEM_BLOCKS_PHP, + 'S' => _AM_SYSTEM_BLOCKS_AFWSMILE, + 'T' => _AM_SYSTEM_BLOCKS_AFNOSMILE)); + $form->addElement($ctype_select); + } else { + $form->addElement(new XoopsFormHidden('c_type', 'H')); + } + } else { + if ($this->getVar('template') != '') { + $tplfile_handler =& xoops_gethandler('tplfile'); + $btemplate = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $this->getVar('bid') ); + if (count($btemplate) > 0) { + $form->addElement(new XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&op=edittpl&id=' . $btemplate[0]->getVar('tpl_id') . '">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>')); + } else { + $btemplate2 = $tplfile_handler->find('default', 'block', $this->getVar('bid')); + if (count($btemplate2) > 0) { + $form->addElement(new XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&op=edittpl&id=' . $btemplate2[0]->getVar('tpl_id') . '" rel="external">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>')); + } + } + } + if ( $this->getOptions() != false ) { + $form->addElement(new XoopsFormLabel(_AM_SYSTEM_BLOCKS_OPTIONS, $this->getOptions())); + } else { + $form->addElement(new XoopsFormHidden('options', $this->getVar('options'))); + } + $form->addElement(new XoopsFormHidden('c_type', 'H')); + } + $cache_select = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $this->getVar('bcachetime')); + $cache_select->addOptionArray(array( + '0' => _NOCACHE, + '30' => sprintf(_SECONDS, 30), + '60' => _MINUTE, + '300' => sprintf(_MINUTES, 5), + '1800' => sprintf(_MINUTES, 30), + '3600' => _HOUR, + '18000' => sprintf(_HOURS, 5), + '86400' => _DAY, + '259200' => sprintf(_DAYS, 3), + '604800' => _WEEK, + '2592000' => _MONTH)); + $form->addElement($cache_select); + // Groups + $form->addElement(new XoopsFormSelectGroup( _AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true) ); + + $form->addElement(new XoopsFormHidden('block_type', $this->getVar('block_type'))); + $form->addElement(new XoopsFormHidden('mid', $this->getVar('mid'))); + $form->addElement(new XoopsFormHidden('func_num', $this->getVar('func_num'))); + $form->addElement(new XoopsFormHidden('func_file', $this->getVar('func_file'))); + $form->addElement(new XoopsFormHidden('show_func', $this->getVar('show_func'))); + $form->addElement(new XoopsFormHidden('edit_func', $this->getVar('edit_func'))); + $form->addElement(new XoopsFormHidden('template', $this->getVar('template'))); + $form->addElement(new XoopsFormHidden('dirname', $this->getVar('dirname'))); + $form->addElement(new XoopsFormHidden('name', $this->getVar('name'))); + $form->addElement(new XoopsFormHidden('bid', $this->getVar('bid'))); + $form->addElement(new XoopsFormHidden('op', $op )); + $form->addElement(new XoopsFormHidden('fct', 'blocksadmin')); + $button_tray = new XoopsFormElementTray('', ' '); + if ($this->isNew() || $this->isCustom()) { + $preview = new XoopsFormButton('', 'previewblock', _PREVIEW, 'preview'); + $preview->setExtra("onclick=\"blocks_preview();\""); + $button_tray->addElement( $preview ); + } + $button_tray->addElement(new XoopsFormButton('', 'submitblock', _SUBMIT, 'submit')); + $form->addElement($button_tray); + + return $form; + } + + /** + * XoopsBlock::getOptions() + * + * @return bool|string + */ + function getOptions() + { + global $xoopsConfig; + if (!$this->isCustom()) { + $edit_func = $this->getVar('edit_func'); + if (!$edit_func) { + return false; + } + if (file_exists($GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file')))) { + if (file_exists($file = $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/blocks.php'))) { + include_once $file; + } elseif (file_exists($file = $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/language/english/blocks.php'))) { + include_once $file; + } + include_once $GLOBALS['xoops']->path('modules/' . $this->getVar('dirname') . '/blocks/' . $this->getVar('func_file')); + $options = explode("|", $this->getVar("options")); + $edit_form = $edit_func($options); + if (!$edit_form) { + return false; + } + + return $edit_form; + } else { + return false; + } + } else { + return false; + } + } + + /** + * @return bool + */ + function isCustom() + { + if ($this->getVar('block_type') == 'C') return true; + return false; + } + + /** + * do stripslashes/htmlspecialchars according to the needed output + * + * @param \output|string $format output use: S for Show and E for Edit + * @param string|\type $c_type type of block content + * + * @returns string + */ + function getContent($format = 's', $c_type = 'T') + { + $format = strtolower($format); + $c_type = strtoupper($c_type); + switch ($format) { + case 's': + // check the type of content + // H : custom HTML block + // P : custom PHP block + // S : use text sanitizater (smilies enabled) + // T : use text sanitizater (smilies disabled) + if ($c_type == 'H') { + return str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n')); + } else if ($c_type == 'P') { + ob_start(); + echo eval($this->getVar('content', 'n')); + $content = ob_get_contents(); + ob_end_clean(); + + return str_replace('{X_SITEURL}', XOOPS_URL . '/', $content); + } else if ($c_type == 'S') { + $myts =& MyTextSanitizer::getInstance(); + $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n')); + + return $myts->displayTarea($content, 1, 1); + } else { + $myts =& MyTextSanitizer::getInstance(); + $content = str_replace('{X_SITEURL}', XOOPS_URL . '/', $this->getVar('content', 'n')); + + return $myts->displayTarea($content, 1, 0); + } + break; + case 'e': + return $this->getVar('content', 'e'); + break; + default: + return $this->getVar('content', 'n'); + break; + } + } +} + +/** + * System block handler class. (Singelton) + * + * This class is responsible for providing data access mechanisms to the data source + * of XOOPS block class objects. + * + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @package system + * @subpackage avatar + */ +class SystemBlockHandler extends XoopsPersistableObjectHandler +{ + /** + * @param null|object $db + */ + function __construct($db) + { + parent::__construct($db, 'newblocks', 'SystemBlock', 'bid', 'title'); + } + + /** + * @param object $obj + * + * @return mixed + */ + function insert($obj) + { + $obj->setVar('last_modified', time()); + + return parent::insert($obj); + } + + /** + * retrieve array of {@link XoopsBlock}s meeting certain conditions + * + * @param object $criteria {@link CriteriaElement} with conditions for the blocks + * @param bool $id_as_key should the blocks' bid be the key for the returned array? + * @return array {@link XoopsBlock}s matching the conditions + **/ + function getObjects($criteria = null, $id_as_key = false) + { + $ret = array(); + $limit = $start = 0; + $sql = 'SELECT DISTINCT(b.bid), b.* FROM ' . $this->db->prefix('newblocks') . ' b LEFT JOIN ' . $this->db->prefix('block_module_link') . ' l ON b.bid=l.block_id'; + if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) { + $sql .= ' ' . $criteria->renderWhere(); + $limit = $criteria->getLimit(); + $start = $criteria->getStart(); + } + $result = $this->db->query($sql, $limit, $start); + if (!$result) { + return $ret; + } + + while ($myrow = $this->db->fetchArray($result)) { + $block = new SystemBlock(); + $block->assignVars($myrow); + if (!$id_as_key) { + $ret[] =& $block; + } else { + $ret[$myrow['bid']] = & $block; + } + unset($block); + } + + return $ret; + } + + /** + * get all the blocks that match the supplied parameters + * + * @param $groupid groupid (can be an array) + * @param bool $asobject + * @param $side + * 0: sideblock - left + * 1: sideblock - right + * 2: sideblock - left and right + * 3: centerblock - left + * 4: centerblock - right + * 5: centerblock - center + * 6: centerblock - left, right, center + * @param $visible 0: not visible 1: visible + * @param \order|string $orderby order of the blocks + * @param int $isactive + * @returns array of block objects + */ + function getAllBlocksByGroup($groupid, $asobject = true, $side = null, $visible = null, $orderby = "b.weight,b.bid", $isactive = 1) + { + $db =& XoopsDatabaseFactory::getDatabaseConnection(); + $ret = array(); + if (!$asobject) { + $sql = 'SELECT b.bid '; + } else { + $sql = 'SELECT b.* '; + } + $sql .= "FROM " . $db->prefix("newblocks") . " b LEFT JOIN " . $db->prefix("group_permission") . " l ON l.gperm_itemid=b.bid WHERE gperm_name = 'block_read' AND gperm_modid = 1"; + if (is_array($groupid)) { + $sql .= " AND (l.gperm_groupid=" . $groupid[0] . ""; + $size = count($groupid); + if ($size > 1) { + for ($i = 1; $i < $size; ++$i) { + $sql .= " OR l.gperm_groupid=" . $groupid[$i] . ""; + } + } + $sql .= ")"; + } else { + $sql .= " AND l.gperm_groupid=" . $groupid . ""; + } + $sql .= " AND b.isactive=" . $isactive; + if (isset($side)) { + // get both sides in sidebox? (some themes need this) + if ($side == XOOPS_SIDEBLOCK_BOTH) { + $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; + } + $sql .= " AND " . $side; + } + if (isset($visible)) { + $sql .= " AND b.visible=$visible"; + } + $sql .= " ORDER BY $orderby"; + $result = $db->query($sql); + $added = array(); + while ($myrow = $db->fetchArray($result)) { + if (!in_array($myrow['bid'], $added)) { + if (!$asobject) { + $ret[] = $myrow['bid']; + } else { + $ret[] = new XoopsBlock($myrow); + } + array_push($added, $myrow['bid']); + } + } + + return $ret; + } + + /** + * @param $groupid + * + * @return array + */ + function getBlockByPerm( $groupid ) + { + $ret = array(); + if (isset($groupid)) { + $sql = "SELECT DISTINCT gperm_itemid FROM " . $this->db->prefix('group_permission') . " WHERE gperm_name = 'block_read' AND gperm_modid = 1"; + if ( is_array($groupid) ) { + $sql .= ' AND gperm_groupid IN (' . implode(',', $groupid) . ')'; + } else { + if (intval($groupid) > 0) { + $sql .= ' AND gperm_groupid=' . intval($groupid); + } + } + $result = $this->db->query($sql); + $blockids = array(); + while ( $myrow = $this->db->fetchArray( $result ) ) { + $blockids[] = $myrow['gperm_itemid']; + } + if (empty($blockids)) { + return $blockids; + } + + return $blockids; + } + } + + /** + * @param $groupid + * @param int $module_id + * @param bool $toponlyblock + * @param null $visible + * @param string $orderby + * @param int $isactive + * + * @return array + */ + function getAllByGroupModule($groupid, $module_id = 0, $toponlyblock = false, $visible = null, $orderby = 'b.weight, m.block_id', $isactive = 1) + { + $isactive = intval($isactive); + $db = $GLOBALS['xoopsDB']; + $ret = array(); + if (isset($groupid)) { + $sql = "SELECT DISTINCT gperm_itemid FROM ".$db->prefix('group_permission')." WHERE gperm_name = 'block_read' AND gperm_modid = 1"; + if ( is_array($groupid) ) { + $sql .= ' AND gperm_groupid IN ('.implode(',', $groupid).')'; + } else { + if (intval($groupid) > 0) { + $sql .= ' AND gperm_groupid='.intval($groupid); + } + } + $result = $db->query($sql); + $blockids = array(); + while ( $myrow = $db->fetchArray($result) ) { + $blockids[] = $myrow['gperm_itemid']; + } + if (empty($blockids)) { + return $blockids; + } + } + $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid'; + $sql .= ' AND b.isactive='.$isactive; + if (isset($visible)) { + $sql .= ' AND b.visible='.intval($visible); + } + if (!isset($module_id)) { + } elseif (!empty($module_id)) { + $sql .= ' AND m.module_id IN (0,'. intval($module_id); + if ($toponlyblock) { + $sql .= ',-1'; + } + $sql .= ')'; + } else { + if ($toponlyblock) { + $sql .= ' AND m.module_id IN (0,-1)'; + } else { + $sql .= ' AND m.module_id=0'; + } + } + if (!empty($blockids)) { + $sql .= ' AND b.bid IN ('.implode(',', $blockids).')'; + } + $sql .= ' ORDER BY '.$orderby; + $result = $db->query($sql); + while ( $myrow = $db->fetchArray($result) ) { + $block = new XoopsBlock($myrow); + $ret[$myrow['bid']] =& $block; + unset($block); + } + + return $ret; + } + + /** + * @param int $module_id + * @param bool $toponlyblock + * @param null $visible + * @param string $orderby + * @param int $isactive + * + * @return array + */ + function getNonGroupedBlocks($module_id = 0, $toponlyblock = false, $visible = null, $orderby = 'b.weight, m.block_id', $isactive = 1) + { + $db = $GLOBALS['xoopsDB']; + $ret = array(); + $bids = array(); + $sql = "SELECT DISTINCT(bid) from ".$db->prefix('newblocks'); + if ($result = $db->query($sql)) { + while ( $myrow = $db->fetchArray($result) ) { + $bids[] = $myrow['bid']; + } + } + $sql = "SELECT DISTINCT(p.gperm_itemid) from ".$db->prefix('group_permission')." p, ".$db->prefix('groups')." g WHERE g.groupid=p.gperm_groupid AND p.gperm_name='block_read'"; + $grouped = array(); + if ($result = $db->query($sql)) { + while ( $myrow = $db->fetchArray($result) ) { + $grouped[] = $myrow['gperm_itemid']; + } + } + $non_grouped = array_diff($bids, $grouped); + if (!empty($non_grouped)) { + $sql = 'SELECT b.* FROM '.$db->prefix('newblocks').' b, '.$db->prefix('block_module_link').' m WHERE m.block_id=b.bid'; + $sql .= ' AND b.isactive='.intval($isactive); + if (isset($visible)) { + $sql .= ' AND b.visible='.intval($visible); + } + if (!isset($module_id)) { + } elseif (!empty($module_id)) { + $sql .= ' AND m.module_id IN (0,'. intval($module_id); + if ($toponlyblock) { + $sql .= ',-1'; + } + $sql .= ')'; + } else { + if ($toponlyblock) { + $sql .= ' AND m.module_id IN (0,-1)'; + } else { + $sql .= ' AND m.module_id=0'; + } + } + $sql .= ' AND b.bid IN ('.implode(',', $non_grouped).')'; + $sql .= ' ORDER BY '.$orderby; + $result = $db->query($sql); + while ( $myrow = $db->fetchArray($result) ) { + $block = new XoopsBlock($myrow); + $ret[$myrow['bid']] =& $block; + unset($block); + } + } + + return $ret; + } + + /** + * XoopsBlock::countSimilarBlocks() + * + * @param mixed $moduleId + * @param mixed $funcNum + * @param mixed $showFunc + * @return int + */ + function countSimilarBlocks($moduleId, $funcNum, $showFunc = null) + { + $funcNum = intval($funcNum); + $moduleId = intval($moduleId); + if ($funcNum < 1 || $moduleId < 1) { + // invalid query + return 0; + } + $db =& XoopsDatabaseFactory::getDatabaseConnection(); + if (isset($showFunc)) { + // showFunc is set for more strict comparison + $sql = sprintf("SELECT COUNT(*) FROM %s WHERE mid = %d AND func_num = %d AND show_func = %s", $db->prefix('newblocks'), $moduleId, $funcNum, $db->quoteString(trim($showFunc))); + } else { + $sql = sprintf("SELECT COUNT(*) FROM %s WHERE mid = %d AND func_num = %d", $db->prefix('newblocks'), $moduleId, $funcNum); + } + if (!$result = $db->query($sql)) { + return 0; + } + list ($count) = $db->fetchRow($result); + + return $count; + } +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/language/english/admin/blocksadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/language/english/admin/blocksadmin.php 2015-03-18 16:03:06 UTC (rev 13019) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/language/english/admin/blocksadmin.php 2015-03-19 19:09:25 UTC (rev 13020) @@ -46,6 +46,9 @@ define('_AM_SYSTEM_BLOCKS_CBBOTTOMLEFT',"Center Block - Bottom left"); define('_AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT',"Center Block - Bottom right"); define('_AM_SYSTEM_BLOCKS_CBBOTTOM',"Center Block - Bottom"); +define('_AM_SYSTEM_BLOCKS_CBFOOTERLEFT',"Center Block - Footer left"); +define('_AM_SYSTEM_BLOCKS_CBFOOTERRIGHT',"Center Block - Footer right"); +define('_AM_SYSTEM_BLOCKS_CBFOOTERCENTER',"Center Block - Footer center"); define('_AM_SYSTEM_BLOCKS_WEIGHT',"Weight"); define('_AM_SYSTEM_BLOCKS_VISIBLE',"Visible"); define('_AM_SYSTEM_BLOCKS_VISIBLEIN',"Visible in"); Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/style.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/style.css 2015-03-18 16:03:06 UTC (rev 13019) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/style.css 2015-03-19 19:09:25 UTC (rev 13020) @@ -16,9 +16,14 @@ @import url(tabs.css); /* ==================== General definitions ==================== */ -html { } +html { + width: 100%; + height: 100%; +} body { + width: 100%; + height: 100%; font-family: 'Open Sans', sans-serif; } @@ -168,4 +173,10 @@ .row.row-preferences { margin: 20px 0 0 10px; +} + +@media(max-width:767px) { + .sidenav { + margin-top: -20px; + } } \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/bootnewage.js =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/bootnewage.js 2015-03-18 16:03:06 UTC (rev 13019) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/bootnewage.js 2015-03-19 19:09:25 UTC (rev 13020) @@ -1,7 +1,8 @@ - - - - +/* + * Script for CPanel bootnewage admin theme + * + * Author Txmod Xoops http://www.txmodxoops.org + */ $(document).ready(function(e) { $('ul#tabNav').on('shown', function(e) { e.preventDefault(); @@ -27,17 +28,21 @@ // setup ul.nav.nav-tabs to work as nav-tabs for each div directly under div.panes $("ul.nav.nav-tabs").tabs("div.panes > div"); }); - - $('button#xo-addcat-btn').on('click', function(e) { - e.preventDefault(); - $("div#xo-category-add").toggle(); - }); - - $('button#xo-addimg-btn').on('click', function(e) { - e.preventDefault(); - $("div#xo-images-add").toggle(); - }); - + // Script to show and hide categories and images form of the section system image manager + $(function() { + $('div#xo-category-add').hide(); + $('button#xo-addcat-btn').on('click', function(e) { + e.preventDefault(); + $("div#xo-category-add").toggle(); + $("div#xo-images-add").hide(); + }); + $('div#xo-images-add').hide(); + $('button#xo-addimg-btn').on('click', function(e) { + e.preventDefault(); + $("div#xo-images-add").toggle(); + $("div#xo-category-add").hide(); + }); + }); $(function () { //Load Accordion $("#accordion > h5").bind("click", function(){ Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php 2015-03-18 16:03:06 UTC (rev 13019) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php 2015-03-19 19:09:25 UTC (rev 13020) @@ -74,7 +74,7 @@ $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/bootnewage/assets/css/yellow.css', array('title' => 'yellow', 'media' => 'screen')); $xoTheme->addStylesheet(XOOPS_ADMINTHEME_URL . '/bootnewage/assets/css/blue.css', array('title' => 'blue', 'media' => 'screen')); - $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); + $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.min.js'); $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js'); $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/bootnewage/assets/js/bootstrap.min.js'); $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/bootnewage/assets/js/bootnewage.js'); Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/italian/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/italian/admin.php 2015-03-18 16:03:06 UTC (rev 13019) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/italian/admin.php 2015-03-19 19:09:25 UTC (rev 13020) @@ -2,6 +2,10 @@ // $Id: admin.php 12609 2014-06-16 06:30:00Z beckmi $ define('_OXYGEN_SYSOPTIONS',"System Options"); define('_OXYGEN_INSTALLEDMODULES',"Installed Modules"); +define('_OXYGEN_INSTALLEDMODULES_NUM',"N°"); +define('_OXYGEN_INSTALLEDMODULES_IMAGE',"Image"); +define('_OXYGEN_INSTALLEDMODULES_NAME',"Name"); +define('_OXYGEN_INSTALLEDMODULES_DESCRIPTION',"Description"); define('_OXYGEN_XOOPSTHEMES',"XOOPS Themes"); define('_OXYGEN_XOOPSMODULES',"XOOPS Modules"); define('_OXYGEN_INTERESTSITES',"Links"); @@ -37,9 +41,14 @@ define('_OXYGEN_AUTHENTICATION',"Authentication Options"); define('_OXYGEN_MODULESETTINGS',"System Module Settings"); //Add for styles name +define('_OXYGEN_THEME_COLOR',"Theme Color"); +define('_OXYGEN_DARK',"Dark"); define('_OXYGEN_SILVER',"Silver"); -define('_OXYGEN_DARK',"Dark"); define('_OXYGEN_ORANGE',"Orange"); +define('_OXYGEN_RED',"Red"); +define('_OXYGEN_GREEN',"Green"); +define('_OXYGEN_YELLOW',"Yellow"); +define('_OXYGEN_BLUE',"Blue"); //Add 10 des define('_OXYGEN_XOOPS_LICENSE',"XOOPS License"); define('_OXYGEN_RSS',"RSS Feed"); Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_header.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_header.html 2015-03-18 16:03:06 UTC (rev 13019) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_header.html 2015-03-19 19:09:25 UTC (rev 13020) @@ -1,8 +1,8 @@ <!-- Header --> - <nav id="top-nav" class="navbar navbar-inverse navbar-static-top"> + <nav id="top-nav" class="navbar navbar-inverse navbar-static-top" role="navigation"> <div class="container-fluid"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> + <div class="navbar-header"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html 2015-03-18 16:03:06 UTC (rev 13019) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html 2015-03-19 19:09:25 UTC (rev 13020) @@ -1,7 +1,7 @@ <table class="table table-striped table-bordered table-hover"> <thead> <tr> - <h4 colspan="4"><{$smarty.const._OXYGEN_INSTALLEDMODULES}></h4> + <th colspan="4"><{$smarty.const._OXYGEN_INSTALLEDMODULES}></th> </tr> <tr> <th class="text-center"><{$smarty.const._OXYGEN_INSTALLEDMODULES_NUM}></th> |
From: <txm...@us...> - 2015-03-18 16:03:09
|
Revision: 13019 http://sourceforge.net/p/xoops/svn/13019 Author: txmodxoops Date: 2015-03-18 16:03:06 +0000 (Wed, 18 Mar 2015) Log Message: ----------- Updated for adaptive assets folder Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/accordion.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/buttonbar.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/choosestyle.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dark.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/footer.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/forms.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/globalnav.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/icons.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/orange.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/pagenav.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/reset.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/silver.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/style.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tablesorter.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tabs.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/toolbar.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tooltip.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/english/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/menu.php Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/accordion.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/accordion.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/accordion.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -12,13 +12,13 @@ */ #accordion { - border:1px solid #f5f5f5; + border:1px solid #f5f5f5; background-color: #f0f0f0; color: #333; width: 100%; - box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; - -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; } @@ -31,7 +31,7 @@ background: url(../img/accordion.png) repeat-x !important; color: #fff; border: 1px solid #FFF; - font-weight: bold; + font-weight: bold; } /* currently active header */ @@ -48,7 +48,7 @@ line-height: 120%; } -.xgiftshop { +.xgiftshop { text-align: center !important; } @@ -79,4 +79,4 @@ #xolicenses a:hover { color: #FF0000; text-decoration: none; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/buttonbar.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/buttonbar.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/buttonbar.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -93,4 +93,4 @@ #buttonbar a:hover span { background-position: 100% -69px !important; color: #BC2A4D !important; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/choosestyle.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/choosestyle.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/choosestyle.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -24,10 +24,10 @@ -webkit-border-radius: 4px; -khtml-border-radius: 4px; border-radius: 4px; - box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; - -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; - -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; cursor: pointer; } @@ -35,9 +35,9 @@ background-color: #C2CEEF; color: #000; text-decoration: none; - box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; - -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; - -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; - -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; cursor: pointer; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -99,7 +99,7 @@ } .xoopsQuote { - + } q,cite { @@ -286,4 +286,4 @@ background-color: #fff; background-image: none; color: #333; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dark.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dark.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dark.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -125,4 +125,4 @@ #main-logo a { background: url(../img/dark/header-logo_big.png) no-repeat !important ; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -96,4 +96,4 @@ vertical-align: top; } #xo-module-log {text-align: center;} -.logger {margin: 1em auto !important; text-align: left;} \ No newline at end of file +.logger {margin: 1em auto !important; text-align: left;} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/footer.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/footer.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/footer.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -45,4 +45,4 @@ margin-right: 50px; margin-top: -30px; text-align: right; -} +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/forms.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/forms.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/forms.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,14 +1,14 @@ -/* - * Default Admin Theme - * - * @copyright Xoops Project <http://www.xoops.org/> - * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 - * @package themes - * @since 2.5.x - * @author Xoops Design Theme <http://www.xoops.org/> - * @maintained Xoops Design Theme <http://www.xoops.org/> - * - * @version $Id +/* + * Default Admin Theme + * + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id */ /*======= forms ========*/ input,button,select { vertical-align: middle; @@ -96,7 +96,7 @@ -webkit-border-radius: 5px; -khtml-border-radius: 5px; border-radius: 5px; - + } input[type=text],input[type=password],input[type=file] { @@ -126,4 +126,4 @@ input[type=checkbox],input[type=radio] { margin: 3px; padding: 2px; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/globalnav.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/globalnav.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/globalnav.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -106,4 +106,4 @@ #xo_globalnav ul.menu .topline { border-top: 1px solid #aaa; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/icons.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/icons.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/icons.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -117,4 +117,4 @@ text-decoration: underline; color: #CC0000; } - + Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -25,11 +25,11 @@ padding-left: 2%; padding-right: 2%; width: 96% !important; - + } #xo-logger-errors {} #xo-logger-deprecated {} #xo-logger-queries {} #xo-logger-blocks {} #xo-logger-extra {} -#xo-logger-timers {} \ No newline at end of file +#xo-logger-timers {} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/orange.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/orange.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/orange.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -126,4 +126,4 @@ background: url(../img/orange/header-logo_big.png) no-repeat !important; } -#xo-modname { color: #FBFBFB;} \ No newline at end of file +#xo-modname { color: #FBFBFB;} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/pagenav.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/pagenav.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/pagenav.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -70,9 +70,9 @@ } .xo-counterpage:hover { - + } .xo-pagarrow { letter-spacing: 0.2em; -} +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/reset.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/reset.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/reset.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,14 +1,14 @@ -/* - * Default Admin Theme - * - * @copyright Xoops Project <http://www.xoops.org/> - * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 - * @package themes - * @since 2.5.x - * @author Xoops Design Theme <http://www.xoops.org/> - * @maintained Xoops Design Theme <http://www.xoops.org/> - * - * @version $Id +/* + * Default Admin Theme + * + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id */ * { margin: 0; padding: 0; border: 0; outline: none; text-decoration: none; font-family: sans-serif; font-size: 1em; font-weight: normal; font-style: normal; resize:none; } @@ -31,4 +31,4 @@ table { border-collapse: separate; border-spacing: 0;} caption, th, td { font-weight: normal;} blockquote:before, blockquote:after, q:before, q:after { content: "";} -blockquote, q { quotes: "" "";} \ No newline at end of file +blockquote, q { quotes: "" "";} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/silver.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/silver.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/silver.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -150,7 +150,7 @@ /*=========== logger ============*/ #xo-logger-tabs { background-color: #BFBFBF !important; - + } div.jGrowl div.jGrowl-notification,div.jGrowl div.jGrowl-closer { @@ -169,4 +169,4 @@ { background-color: #C2CEEF; } -#xo-modname {color : #898A8D;} \ No newline at end of file +#xo-modname {color : #898A8D;} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/style.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/style.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/style.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -10,7 +10,7 @@ * * @version $Id */ - /* ==================== Import others style cheats ==================== */ + /* ==================== Import other stylesheets ==================== */ @import url(reset.css); @import url(dashboard.css); @import url(buttonbar.css); @@ -30,7 +30,7 @@ /* ==================== General definitions ==================== */ html { - + } body { Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tablesorter.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tablesorter.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tablesorter.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -26,4 +26,4 @@ background-image: url(../img/desc.gif); background-repeat: no-repeat; background-position: center right; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tabs.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tabs.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tabs.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -10,34 +10,34 @@ * * @version $Id */ -.tabs { - list-style:none; - margin:0 !important; +.tabs { + list-style:none; + margin:0 !important; padding: 10px 0 0 0; height:30px; border-bottom: 3px solid #393e41; } /* single tab */ -.tabs li { - float:left; +.tabs li { + float:left; text-indent:0; padding:0; margin:0 !important; - list-style-image:none !important; + list-style-image:none !important; list-style-type: none; } /* link inside the tab. uses a background image */ -.tabs a { +.tabs a { font-size:11px; display:block; width: 55px; - text-align:center; + text-align:center; text-decoration:none; color:#000; padding: 5px 0 0 0; - margin: -10px 1px 0 1px !important; + margin: -10px 1px 0 1px !important; position:relative; top:1px; background-color: #f1f1f1 !important; @@ -45,11 +45,11 @@ border-color: #ddd; border-style: solid; border-top-left-radius: 5px; - -moz-border-radius-topleft: 5px; + -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -khtml-border-top-left-radius: 5px; border-top-right-radius: 5px; - -moz-border-radius-topright: 5px; + -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -khtml-border-top-right-radius: 5px; box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; @@ -58,28 +58,28 @@ -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; } - + .tabs a:active { outline:none; - + } /* when mouse enters the tab move the background image */ .tabs a:hover { - color:#fff; + color:#fff; background-color: #dedede !important; } /* active tab uses a class name "current". it's highlight is also done by moving the background image. */ .tabs .current, .tabs .current:hover, .tabs li.current a { - cursor:default !important; + cursor:default !important; color:#000 !important; background-color: #dedede !important; } -/* initially all panes are hidden */ +/* initially all panes are hidden */ .panes .pane { - display:none; + display:none; } .panes ul { @@ -92,7 +92,7 @@ -khtml-border-radius: 6px; border-radius: 6px; } - + .panes li { list-style-type: none; padding: 5px; Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/toolbar.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/toolbar.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/toolbar.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -48,4 +48,4 @@ float: right; margin-left: 30px; margin-right: 30px; -} +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tooltip.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tooltip.css 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tooltip.css 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,7 +1,7 @@ /* * Default Admin Theme * - * @copyright Xoops Project <http://www.xoops.org/> + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 * @package themes * @since 2.5.x @@ -21,8 +21,8 @@ -webkit-border-radius: 3px; -khtml-border-radius: 3px; border-radius: 3px; - box-shadow: 3px 2px 3px rgba(0,0,0,0.5); - -moz-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + -moz-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); -webkit-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); -khtml-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); filter: alpha(opacity = 80); @@ -41,4 +41,4 @@ #tooltip img { padding-bottom: 10px !important; text-align: center !important; -} \ No newline at end of file +} Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php 2015-03-18 16:03:06 UTC (rev 13019) @@ -14,7 +14,7 @@ /* * Xoops Cpanel default GUI class * - * @copyright The XOOPS project http://sf.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package system * @usbpackage GUI @@ -25,7 +25,7 @@ * @author BitC3R0 <Bi...@gm...> * @author trabis <lus...@gm...> * @version 1.2 - * @version $Id: default.php 12360 2014-03-08 09:46:59Z beckmi $ + * @version $Id: default.php 12852 2014-11-17 03:34:31Z rgriffith $ */ /** @@ -61,10 +61,7 @@ global $xoopsConfig, $xoopsUser, $xoopsModule, $xoTheme, $xoopsTpl; $tpl =& $this->template; - $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.min.js'); - // - $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.min.js'); - // + $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/assets/js/styleswitch.js'); $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/assets/js/formenu.js'); $xoTheme->addScript(XOOPS_ADMINTHEME_URL . '/default/assets/js/menu.js'); @@ -116,7 +113,7 @@ $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php', 'text' => _CPHOME, 'menu' => $menu)); //add SYSTEM Menu items - include dirname(__FILE__) . '/menu.php'; + include __DIR__ . '/menu.php'; if (empty($xoopsModule) || 'system' == $xoopsModule->getVar('dirname', 'n')) { $modpath = XOOPS_URL . '/admin.php'; $modname = _OXYGEN_SYSOPTIONS; @@ -169,7 +166,7 @@ } else { $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid'); } - $rtn['title'] = $mod->name(); + $rtn['title'] = htmlspecialchars($mod->name(), ENT_QUOTES); $rtn['absolute'] = 1; $rtn['url'] = XOOPS_URL . '/modules/'. $mod->getVar('dirname', 'n') . '/'; //add for sub menus $modOptions = $mod->getAdminMenu(); //add for sub menus @@ -242,7 +239,7 @@ $sadmin = $moduleperm_handler->checkRight('module_admin', $mod->getVar('mid'), $xoopsUser->getGroups()); if ($sadmin && ($mod->getVar('hasnotification') || is_array($mod->getInfo('config')) || is_array($mod->getInfo('comments')))) { $rtn['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar('mid'); - $rtn['title'] = $mod->name(); + $rtn['title'] = htmlspecialchars($mod->name(), ENT_QUOTES); $rtn['absolute'] = 1; $rtn['icon'] = XOOPS_ADMINTHEME_URL . '/gui/oxygen/icons/prefs_small.png'; $menu[] = $rtn; @@ -260,17 +257,17 @@ 'link' => 'http://xoops.org', 'title' => _OXYGEN_WEBSITE, 'absolute' => 1, - 'icon' => XOOPS_ADMINTHEME_URL . '/default/assets/img/xoops.png'); + 'icon' => XOOPS_ADMINTHEME_URL . '/default/assets/images/xoops.png'); $menu[] = array( 'link' => 'http://www.xoops.org/modules/repository/', 'title' => _OXYGEN_XOOPSMODULES, 'absolute' => 1, - 'icon' => XOOPS_ADMINTHEME_URL . '/default/assets/img/xoops.png'); + 'icon' => XOOPS_ADMINTHEME_URL . '/default/assets/images/xoops.png'); $menu[] = array( 'link' => 'http://www.xoops.org/modules/extgallery/', 'title' => _OXYGEN_XOOPSTHEMES, 'absolute' => 1, - 'icon' => XOOPS_ADMINTHEME_URL . '/default/assets/img/tweb.png'); + 'icon' => XOOPS_ADMINTHEME_URL . '/default/assets/images/tweb.png'); $tpl->append('navitems', array('link' => XOOPS_URL . '/admin.php','text' => _OXYGEN_INTERESTSITES, 'menu' => $menu)); @@ -301,7 +298,7 @@ } else { $rtn ['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar ( 'mid' ); } - $rtn ['title'] = $mod->getVar ('name'); + $rtn ['title'] = htmlspecialchars($mod->getVar ('name'), ENT_QUOTES); $rtn ['description'] = $mod->getInfo('description'); $rtn ['absolute'] = 1; if (isset ( $info ['icon_big'] )) { @@ -309,10 +306,8 @@ } elseif (isset ( $info ['image'] )) { $rtn ['icon'] = XOOPS_URL . '/modules/' . $mod->getVar ( 'dirname', 'n' ) . '/' . $info ['image']; } - $tpl->append ( 'modules', $rtn ); } - } } } Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/english/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/english/admin.php 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/english/admin.php 2015-03-18 16:03:06 UTC (rev 13019) @@ -1,5 +1,5 @@ <?php -// $Id: admin.php 12033 2013-09-14 03:16:44Z beckmi $ +// $Id: admin.php 12609 2014-06-16 06:30:00Z beckmi $ define('_OXYGEN_SYSOPTIONS',"System Options"); define('_OXYGEN_INSTALLEDMODULES',"Installed Modules"); define('_OXYGEN_XOOPSTHEMES',"XOOPS Themes"); @@ -46,8 +46,8 @@ define('_OXYGEN_ADMINISTRATION',"XOOPS Administration"); define('_OXYGEN_UPTOP',"Up Top"); //Add help -define('_OXYGEN_HELP_1',"How can I make content ?"); -define('_OXYGEN_HELP_DESC_1','To make content you must first install some module, like the <a href="http://xoops.svn.sourceforge.net/viewvc/xoops/XoopsModules/fmcontent/trunk/?view=tar" rel="external">fmContent</a> or the <a href="https://sourceforge.net/projects/xoops/files/XOOPS%20Module%20Repository/XOOPS2/Content/XOOPS2.5_mod_content_1.4_kerkyra.zip/download" rel="external">Content</a> module. To learn more about modules <a href="modules/system/help.php?mid=1&page=modulesadmin">click here</a>' ); +define('_OXYGEN_HELP_1',"How can I create content with XOOPS?"); +define('_OXYGEN_HELP_DESC_1','To create content, you must first install a content module, like the <a href="https://sourceforge.net/p/xoops/svn/HEAD/tree/XoopsModules/publisher/trunk/" rel="external">Publisher</a> or the <a href="https://sourceforge.net/p/xoops/svn/HEAD/tree/XoopsModules/news/trunk/" rel="external">News</a> module. To learn more about XOOPS modules <a href="modules/system/help.php?mid=1&page=modulesadmin">click here</a>' ); define('_OXYGEN_HELP_2',"What is the Block?"); define('_OXYGEN_HELP_DESC_2','Blocks can provide additional/specific content from the installed modules. There can be and custom blocks which can contain text, JS Code, HTML formatted text, pictures, etc. The content in these blocks may be formatted individually or can inherit formatting from the Website. (<a href="modules/system/help.php?mid=1&page=blocksadmin">more ...</a>)'); define('_OXYGEN_HELP_3',"How I can find more help?"); Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/menu.php 2015-03-17 10:35:00 UTC (rev 13018) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/menu.php 2015-03-18 16:03:06 UTC (rev 13019) @@ -12,7 +12,7 @@ /* * Xoops Cpanel oxygen menu * - * @copyright The XOOPS project http://sf.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license http://www.fsf.org/copyleft/gpl.html GNU public license * @package system * @usbpackage GUI @@ -23,7 +23,7 @@ * @author BitC3R0 <Bi...@gm...> * @author trabis <lus...@gm...> * @version 1.2 - * @version $Id: menu.php 12033 2013-09-14 03:16:44Z beckmi $ + * @version $Id: menu.php 12795 2014-09-21 05:41:46Z beckmi $ */ $groups = $GLOBALS['xoopsUser']->getGroups(); @@ -57,6 +57,6 @@ } unset($modversion); } - $index++; + ++$index; } unset($dirlist); |
From: <txm...@us...> - 2015-03-17 10:35:03
|
Revision: 13018 http://sourceforge.net/p/xoops/svn/13018 Author: txmodxoops Date: 2015-03-17 10:35:00 +0000 (Tue, 17 Mar 2015) Log Message: ----------- Updated Fixed bugs Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/pagenav.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/activate.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changemail.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changepass.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/register.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/search.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/userinfo.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/class/menu.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_banners.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_blocks.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_comments.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_groups.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_help.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_images.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_maintenance.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_modules_confirm.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_pagenav.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_smilies.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_templates.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_userrank.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_users.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/system_pagenav.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/bootnewage.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_tabs.html Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2015-03-17 10:35:00 UTC (rev 13018) @@ -234,12 +234,12 @@ case "folder": if (!is_dir($value)) { - $line .= "<span style='color : red; font-weight : bold;'>"; + $line .= "<span class='red bold'>"; $line .= "<img src='" . $path . "0.png' >"; $line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDERKO, $value); $line .= "</span>\n"; } else { - $line .= "<span style='color : green;'>"; + $line .= "<span class='green'>"; $line .= "<img src='" . $path . "1.png' >"; $line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDEROK, $value); $line .= "</span>\n"; @@ -249,12 +249,12 @@ case "chmod": if (is_dir($value[0])) { if (substr(decoct(fileperms($value[0])),2) != $value[1]) { - $line .= "<span style='color : red; font-weight : bold;'>"; + $line .= "<span class='red bold'>"; $line .= "<img src='" . $path . "0.png' >"; $line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])),2)); $line .= "</span>\n"; } else { - $line .= "<span style='color : green;'>"; + $line .= "<span class='green'>"; $line .= "<img src='" . $path . "1.png' >"; $line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])),2)); $line .= "</span>\n"; @@ -278,10 +278,10 @@ { $ret = "<table class=\"table table-stripped\">\n<tr>\n"; $ret .= "<td width=\"auto\">\n"; - $ret .= $this -> renderMenuIndex(); + $ret .= $this->renderMenuIndex(); $ret .= "</td>\n"; $ret .= "<td width=\"auto\">\n"; - $ret .= $this -> renderInfoBox(); + $ret .= $this->renderInfoBox(); $ret .= "</td>\n"; $ret .= "</tr>\n"; // If you use a config label @@ -296,9 +296,9 @@ $path = XOOPS_URL . "/Frameworks/moduleclasses/icons/16/"; if ($this->_obj->getInfo('min_php')) { if (version_compare(phpversion(), $this->_obj->getInfo('min_php'), '<')) { - $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n"; + $ret .= "<span class='red bold'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n"; } else { - $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n"; + $ret .= "<span class='green'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n"; } $ret .= "<br />"; } @@ -341,18 +341,18 @@ } } if ($reqVer > $curVer) { - $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(XOOPS_DB_TYPE.' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br />\n"; + $ret .= "<span class='red bold'><img src='" . $path . "0.png' >" . sprintf(XOOPS_DB_TYPE.' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br />\n"; } else { - $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(strtoupper(XOOPS_DB_TYPE).' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br />\n"; + $ret .= "<span class='green'><img src='" . $path . "1.png' >" . sprintf(strtoupper(XOOPS_DB_TYPE).' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br />\n"; } } // xoops version if ($this->_obj->getInfo('min_xoops')) { if (substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6) < $this->_obj->getInfo('min_xoops')) { - $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n"; + $ret .= "<span class='red bold'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n"; } else { - $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n"; + $ret .= "<span class='green'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION)-6)) . "</span>\n"; } $ret .= "<br />"; } @@ -360,9 +360,9 @@ // ModuleAdmin version if ($this->_obj->getInfo('min_admin')) { if ($this->getVersion() < $this->_obj->getInfo('min_admin')) { - $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n"; + $ret .= "<span class='red bold'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n"; } else { - $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n"; + $ret .= "<span class='green'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n"; } $ret .= "<br />"; } @@ -567,7 +567,7 @@ foreach (array_keys( $this->_obj->adminmenu) as $i) { if ($this->_obj->adminmenu[$i]['link'] == "admin/" . $menu) { $navigation .= $this->_obj->adminmenu[$i]['title'] . " | "; - $ret = "<div class=\"CPbigTitle\" style=\"background-image: url(" . $path . $this->_obj->adminmenu[$i]['icon'] . "); background-repeat: no-repeat; background-position: left; padding-left: 50px;\"> + $ret = "<div class=\"CPbigTitle\" style=\"background-image: url(" . $path . $this->_obj->adminmenu[$i]['icon'] . "); background-repeat: no-repeat; background-position: left; padding: 20px 1px 20px 50px;\"> <strong>" . $this->_obj->adminmenu[$i]['title'] . "</strong></div><br />"; } else { $navigation .= "<a href = '../" . $this->_obj->adminmenu[$i]['link'] . "'>" . $this->_obj->adminmenu[$i]['title'] . "</a> | "; @@ -577,7 +577,6 @@ $navigation .= "<a href = '../../system/admin.php?fct=preferences&op=showmod&mod=" . $this->_obj->getVar('mid') . "'>" . _MI_SYSTEM_ADMENU6 . "</a>"; $ret = $navigation . "<br /><br />" . $ret; } - return $ret; } } Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/pagenav.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/pagenav.php 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/pagenav.php 2015-03-17 10:35:00 UTC (rev 13018) @@ -157,7 +157,7 @@ $size = ' pagination-' . $size; } $xoopsTpl->assign('size', $size); - $xoopsTpl->assign('align', ' pagination-' . $align); + $xoopsTpl->assign('align', ' pull-' . $align); $xoopsTpl->assign('pagination_nav', true); $ret = $xoopsTpl->fetch('db:system_pagenav.html'); $xoopsTpl->clear_assign('xo_nav'); Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/activate.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/activate.php 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/activate.php 2015-03-17 10:35:00 UTC (rev 13018) @@ -105,5 +105,5 @@ $form->display(); } -$xoBreadcrumbs[] = array('title' => _PROFILE_MA_REGISTER); +$xoBreadcrumbs[] = array('title' => _MA_PROFILE_REGISTER); include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php'; Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changemail.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changemail.php 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changemail.php 2015-03-17 10:35:00 UTC (rev 13018) @@ -32,9 +32,9 @@ if (!isset($_POST['submit']) || !isset($_POST['passwd'])) { //show change password form include_once $GLOBALS['xoops']->path('class/xoopsformloader.php'); - $form = new XoopsThemeForm(_PROFILE_MA_CHANGEMAIL, 'emailform', $_SERVER['REQUEST_URI'], 'post', true); + $form = new XoopsThemeForm(_MA_PROFILE_CHANGEMAIL, 'emailform', $_SERVER['REQUEST_URI'], 'post', true); $form->addElement(new XoopsFormPassword(_US_PASSWORD, 'passwd', 15, 50), true); - $form->addElement(new XoopsFormText(_PROFILE_MA_NEWMAIL, 'newmail', 15, 50), true); + $form->addElement(new XoopsFormText(_MA_PROFILE_NEWMAIL, 'newmail', 15, 50), true); $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); $form->assign($GLOBALS['xoopsTpl']); } else { @@ -43,7 +43,7 @@ $email = @$myts->stripSlashesGPC(trim($_POST['newmail'])); $errors = array(); if (md5($pass) != $GLOBALS['xoopsUser']->getVar('pass', 'n')) { - $errors[] = _PROFILE_MA_WRONGPASSWORD; + $errors[] = _MA_PROFILE_WRONGPASSWORD; } if (!checkEmail($email)) { $errors[] = _US_INVALIDMAIL; @@ -57,7 +57,7 @@ $member_handler =& xoops_gethandler('member'); if ($member_handler->insertUser($GLOBALS['xoopsUser'])) { - $msg = _PROFILE_MA_EMAILCHANGED; + $msg = _MA_PROFILE_EMAILCHANGED; //send email to new email address $xoopsMailer =& xoops_getMailer(); @@ -71,7 +71,7 @@ $xoopsMailer->setToEmails($email); $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']); $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']); - $xoopsMailer->setSubject(sprintf(_PROFILE_MA_NEWEMAIL, $GLOBALS['xoopsConfig']['sitename'])); + $xoopsMailer->setSubject(sprintf(_MA_PROFILE_NEWEMAIL, $GLOBALS['xoopsConfig']['sitename'])); $xoopsMailer->send(); } else { @@ -81,6 +81,6 @@ redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/userinfo.php?uid=' . $GLOBALS['xoopsUser']->getVar('uid'), 2, $msg); } -$xoBreadcrumbs[] = array('title' => _PROFILE_MA_CHANGEMAIL); +$xoBreadcrumbs[] = array('title' => _MA_PROFILE_CHANGEMAIL); include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php'; Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changepass.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changepass.php 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changepass.php 2015-03-17 10:35:00 UTC (rev 13018) @@ -29,14 +29,14 @@ if (!isset($_POST['submit'])) { //show change password form include_once $GLOBALS['xoops']->path('class/xoopsformloader.php'); - $form = new XoopsThemeForm(_PROFILE_MA_CHANGEPASSWORD, 'form', $_SERVER['REQUEST_URI'], 'post', true); - $form->addElement(new XoopsFormPassword(_PROFILE_MA_OLDPASSWORD, 'oldpass', 15, 50), true); - $form->addElement(new XoopsFormPassword(_PROFILE_MA_NEWPASSWORD, 'newpass', 15, 50), true); + $form = new XoopsThemeForm(_MA_PROFILE_CHANGEPASSWORD, 'form', $_SERVER['REQUEST_URI'], 'post', true); + $form->addElement(new XoopsFormPassword(_MA_PROFILE_OLDPASSWORD, 'oldpass', 15, 50), true); + $form->addElement(new XoopsFormPassword(_MA_PROFILE_NEWPASSWORD, 'newpass', 15, 50), true); $form->addElement(new XoopsFormPassword(_US_VERIFYPASS, 'vpass', 15, 50), true); $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); $form->assign($GLOBALS['xoopsTpl']); - $xoBreadcrumbs[] = array('title' => _PROFILE_MA_CHANGEPASSWORD); + $xoBreadcrumbs[] = array('title' => _MA_PROFILE_CHANGEPASSWORD); } else { $config_handler =& xoops_gethandler('config'); @@ -47,7 +47,7 @@ $vpass = @$myts->stripSlashesGPC(trim($_POST['vpass'])); $errors = array(); if (md5($oldpass) != $GLOBALS['xoopsUser']->getVar('pass', 'n')) { - $errors[] = _PROFILE_MA_WRONGPASSWORD; + $errors[] = _MA_PROFILE_WRONGPASSWORD; } if (strlen($password) < $GLOBALS['xoopsConfigUser']['minpass']) { $errors[] = sprintf(_US_PWDTOOSHORT, $GLOBALS['xoopsConfigUser']['minpass']); @@ -64,9 +64,9 @@ $member_handler =& xoops_gethandler('member'); if ($member_handler->insertUser($GLOBALS['xoopsUser'])) { - $msg = _PROFILE_MA_PASSWORDCHANGED; + $msg = _MA_PROFILE_PASSWORDCHANGED; } else { - $msg = _PROFILE_MA_ERRORDURINGSAVE; + $msg = _MA_PROFILE_ERRORDURINGSAVE; } } redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/userinfo.php?uid=' . $GLOBALS['xoopsUser']->getVar('uid'), 2, $msg); Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/register.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/register.php 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/register.php 2015-03-17 10:35:00 UTC (rev 13018) @@ -64,7 +64,7 @@ // First step is already secured by with the captcha Token so lets check the others if ($current_step > 0 && !$GLOBALS['xoopsSecurity']->check()) { - redirect_header('user.php', 5, _PROFILE_MA_EXPIRED); + redirect_header('user.php', 5, _MA_PROFILE_EXPIRED); exit(); } @@ -73,7 +73,7 @@ $regstep_handler = xoops_getmodulehandler('regstep'); if (!$steps = $regstep_handler->getAll($criteria, null, false, false)) { - redirect_header(XOOPS_URL . '/', 6, _PROFILE_MA_NOSTEPSAVAILABLE); + redirect_header(XOOPS_URL . '/', 6, _MA_PROFILE_NOSTEPSAVAILABLE); exit(); } @@ -81,13 +81,13 @@ $steps[$key]['step_no'] = $key + 1; } -$xoopsOption['template_main'] = 'profile_register.html'; +$xoopsOption['template_main'] = 'profile_register.tpl'; include $GLOBALS['xoops']->path('header.php'); $GLOBALS['xoopsTpl']->assign('steps', $steps); -$GLOBALS['xoopsTpl']->assign('lang_register_steps', _PROFILE_MA_REGISTER_STEPS); +$GLOBALS['xoopsTpl']->assign('lang_register_steps', _MA_PROFILE_REGISTER_STEPS); -$xoBreadcrumbs[] = array('link' => XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/register.php', 'title' => _PROFILE_MA_REGISTER); +$xoBreadcrumbs[] = array('link' => XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/register.php', 'title' => _MA_PROFILE_REGISTER); if (isset($steps[$current_step])) { $xoBreadcrumbs[] = array('title' => $steps[$current_step]['step_name']); } @@ -252,7 +252,7 @@ $message = ""; if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newuser->getVar('uid'))) { - $message = _PROFILE_MA_REGISTER_NOTGROUP . "<br />"; + $message = _MA_PROFILE_REGISTER_NOTGROUP . "<br />"; } else if ($GLOBALS['xoopsConfigUser']['activation_type'] == 1) { XoopsUserUtility::sendWelcome($newuser); } else if ($GLOBALS['xoopsConfigUser']['activation_type'] == 0) { @@ -311,10 +311,10 @@ $GLOBALS['xoopsTpl']->assign('stop', $stop); } else { // No errors and no more steps, finish - $GLOBALS['xoopsTpl']->assign('finish', _PROFILE_MA_REGISTER_FINISH); + $GLOBALS['xoopsTpl']->assign('finish', _MA_PROFILE_REGISTER_FINISH); $GLOBALS['xoopsTpl']->assign('current_step', -1); if ( $GLOBALS['xoopsConfigUser']['activation_type'] == 1 && !empty($_SESSION['profile_post']['pass'])) { - $GLOBALS['xoopsTpl']->assign('finish_login', _PROFILE_MA_FINISH_LOGIN); + $GLOBALS['xoopsTpl']->assign('finish_login', _MA_PROFILE_FINISH_LOGIN); $GLOBALS['xoopsTpl']->assign('finish_uname', $newuser->getVar('uname')); $GLOBALS['xoopsTpl']->assign('finish_pass', htmlspecialchars($_SESSION['profile_post']['pass'])); } Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/search.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/search.php 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/search.php 2015-03-17 10:35:00 UTC (rev 13018) @@ -79,8 +79,8 @@ switch ($fields[$i]->getVar('field_type')) { case "textbox": if ($fields[$i]->getVar('field_valuetype') == XOBJ_DTYPE_INT) { - $searchform->addElement(new XoopsFormText(sprintf(_PROFILE_MA_LARGERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_larger", 35, 35)); - $searchform->addElement(new XoopsFormText(sprintf(_PROFILE_MA_SMALLERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_smaller", 35, 35)); + $searchform->addElement(new XoopsFormText(sprintf(_MA_PROFILE_LARGERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_larger", 35, 35)); + $searchform->addElement(new XoopsFormText(sprintf(_MA_PROFILE_SMALLERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_smaller", 35, 35)); } else { $tray = new XoopsFormElementTray($fields[$i]->getVar('field_title')); $tray->addElement(new XoopsFormSelectMatchOption('', $fields[$i]->getVar('field_name')."_match")); @@ -111,8 +111,8 @@ case "date": case "datetime": - $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_PROFILE_MA_LATERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_larger", 15, 0)); - $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_PROFILE_MA_EARLIERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_smaller", 15, time())); + $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_MA_PROFILE_LATERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_larger", 15, 0)); + $searchform->addElement(new XoopsFormTextDateSelect(sprintf(_MA_PROFILE_EARLIERTHAN, $fields[$i]->getVar('field_title') ), $fields[$i]->getVar('field_name')."_smaller", 15, time())); break; case "timezone": @@ -132,36 +132,36 @@ } asort($sortby_arr); $sortby_arr = array_merge(array("" => _NONE, "uname" =>_US_NICKNAME, "email" => _US_EMAIL), $sortby_arr); - $sortby_select = new XoopsFormSelect(_PROFILE_MA_SORTBY, 'sortby'); + $sortby_select = new XoopsFormSelect(_MA_PROFILE_SORTBY, 'sortby'); $sortby_select->addOptionArray($sortby_arr); $searchform->addElement($sortby_select); - $order_select = new XoopsFormRadio(_PROFILE_MA_ORDER, 'order', 0); + $order_select = new XoopsFormRadio(_MA_PROFILE_ORDER, 'order', 0); $order_select->addOption(0, _ASCENDING); $order_select->addOption(1, _DESCENDING); $searchform->addElement($order_select); - $limit_text = new XoopsFormText(_PROFILE_MA_PERPAGE, 'limit', 15, 10, $limit_default); + $limit_text = new XoopsFormText(_MA_PROFILE_PERPAGE, 'limit', 15, 10, $limit_default); $searchform->addElement($limit_text); $searchform->addElement(new XoopsFormHidden('op', 'results')); $searchform->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit')); $searchform->assign($GLOBALS['xoopsTpl']); - $GLOBALS['xoopsTpl']->assign('page_title', _PROFILE_MA_SEARCH); + $GLOBALS['xoopsTpl']->assign('page_title', _MA_PROFILE_SEARCH); //added count user $member_handler =& xoops_gethandler('member'); $acttotal = $member_handler->getUserCount(new Criteria('level', 0, '>')); - $total = sprintf(_PROFILE_MA_ACTUS, "<span style='color:#ff0000;'>{$acttotal}</span>"); + $total = sprintf(_MA_PROFILE_ACTUS, "<span style='color:#ff0000;'>{$acttotal}</span>"); $GLOBALS['xoopsTpl']->assign('total_users', $total); break; case "results": $xoopsOption['template_main'] = "profile_results.tpl"; include_once $GLOBALS['xoops']->path('header.php'); - $GLOBALS['xoopsTpl']->assign('page_title', _PROFILE_MA_RESULTS); + $GLOBALS['xoopsTpl']->assign('page_title', _MA_PROFILE_RESULTS); $xoBreadcrumbs[] = array('link' => XOOPS_URL . "/modules/" . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/search.php', 'title' => _SEARCH); - $xoBreadcrumbs[] = array('title' => _PROFILE_MA_RESULTS); + $xoBreadcrumbs[] = array('title' => _MA_PROFILE_RESULTS); $member_handler =& xoops_gethandler('member'); // Dynamic fields @@ -390,7 +390,7 @@ list($users, $profiles, $total_users) = $profile_handler->search($criteria, $searchvars,$searchgroups); - $total =sprintf(_PROFILE_MA_FOUNDUSER, "<span class='red'>{$total_users}</span>")." "; + $total =sprintf(_MA_PROFILE_FOUNDUSER, "<span class='red'>{$total_users}</span>")." "; $GLOBALS['xoopsTpl']->assign('total_users', $total); //Sort information Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/userinfo.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/userinfo.php 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/userinfo.php 2015-03-17 10:35:00 UTC (rev 13018) @@ -45,7 +45,7 @@ $GLOBALS['xoopsTpl']->assign('user_ownpage', true); $GLOBALS['xoopsTpl']->assign('lang_editprofile', _US_EDITPROFILE); - $GLOBALS['xoopsTpl']->assign('lang_changepassword', _PROFILE_MA_CHANGEPASSWORD); + $GLOBALS['xoopsTpl']->assign('lang_changepassword', _MA_PROFILE_CHANGEPASSWORD); $GLOBALS['xoopsTpl']->assign('lang_avatar', _US_AVATAR); $GLOBALS['xoopsTpl']->assign('lang_inbox', _US_INBOX); $GLOBALS['xoopsTpl']->assign('lang_logout', _US_LOGOUT); @@ -219,6 +219,6 @@ $GLOBALS['xoopsTpl']->assign('uname', $thisUser->getVar('uname')); $GLOBALS['xoopsTpl']->assign('email', $email); $GLOBALS['xoopsTpl']->assign('avatar', $avatar); -$GLOBALS['xoopsTpl']->assign('recent_activity', _PROFILE_MA_RECENTACTIVITY); -$xoBreadcrumbs[] = array('title' => _PROFILE_MA_USERINFO); +$GLOBALS['xoopsTpl']->assign('recent_activity', _MA_PROFILE_RECENTACTIVITY); +$xoBreadcrumbs[] = array('title' => _MA_PROFILE_USERINFO); include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php'; Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/class/menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/class/menu.php 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/class/menu.php 2015-03-17 10:35:00 UTC (rev 13018) @@ -190,9 +190,9 @@ $menu .= "<td style='text-align: right; padding-top: 18px;'><strong>" . $this->_obj->getVar( 'name' ) . "</strong> : " . $breadcrumb . "</td>"; $menu .= "</tr>\n</table>\n"; $menu .= "</div>\n"; - $menu .= "<ul class=\"nav nav-tabs\">"; + $menu .= "<ul class=\"nav nav-tabs nav-module\">"; foreach ($this->_menutabs as $k => $v) { - $menu .= "<li id='" . $menuItems[$i] . " role=\"presentation\"'><a href='" . XOOPS_URL . "/modules/" . $this->_obj->getVar( 'dirname' ) . "/" . $k . "'><span>$v</span></a></li>\n"; + $menu .= "<li id='" . $menuItems[$i] . "' role=\"presentation\"><a href='" . XOOPS_URL . "/modules/" . $this->_obj->getVar( 'dirname' ) . "/" . $k . "'><span>$v</span></a></li>\n"; $i++; } $menu .= "</ul>\n"; Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_banners.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_banners.html 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_banners.html 2015-03-17 10:35:00 UTC (rev 13018) @@ -1,59 +1,61 @@ <{includeq file="db:system_header.html"}> <!--Banner--> <table class='table table-striped'> - <tr> - <{if $banner_count == true}> - <td> - <h4><{$smarty.const._AM_SYSTEM_BANNERS_CURACTBNR}></h4> - </td> - <{/if}> - <td> - <div class="pull-right"> - <div class="xo-buttons"> - <a class="ui-corner-all btn" href="admin.php?fct=banners&op=new_banner" title="<{$smarty.const._AM_SYSTEM_BANNERS_ADDNWBNR}>"> - <img src="<{xoAdminIcons attach.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_ADDNWBNR}>" /> - <{$smarty.const._AM_SYSTEM_BANNERS_ADDNWBNR}> - </a> - <a class="ui-corner-all btn" href="admin.php?fct=banners&op=new_client" title="<{$smarty.const._AM_SYSTEM_BANNERS_ADDCLI}>"> - <img src="<{xoAdminIcons user_add.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_ADDCLI}>" /> - <{$smarty.const._AM_SYSTEM_BANNERS_ADDCLI}> - </a> + <tbody> + <tr> + <{if $banner_count == true}> + <td> + <h4><{$smarty.const._AM_SYSTEM_BANNERS_CURACTBNR}></h4> + </td> + <{/if}> + <td> + <div class="pull-right"> + <div class="xo-buttons"> + <a class="ui-corner-all btn" href="admin.php?fct=banners&op=new_banner" title="<{$smarty.const._AM_SYSTEM_BANNERS_ADDNWBNR}>"> + <img src="<{xoAdminIcons attach.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_ADDNWBNR}>" /> + <{$smarty.const._AM_SYSTEM_BANNERS_ADDNWBNR}> + </a> + <a class="ui-corner-all btn" href="admin.php?fct=banners&op=new_client" title="<{$smarty.const._AM_SYSTEM_BANNERS_ADDCLI}>"> + <img src="<{xoAdminIcons user_add.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_ADDCLI}>" /> + <{$smarty.const._AM_SYSTEM_BANNERS_ADDCLI}> + </a> + </div> </div> - </div> - </td> - </tr> + </td> + </tr> + </tbody> </table> <{if $banner_count == true}> <table id="xo-bannerslist-sorter" class="table table-striped"> <thead> - <tr> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_IMPRESION}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_IMPLEFT}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLICKS}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_NCLICKS}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLINAME}></th> - <th class="text-center width10"><{$smarty.const._AM_SYSTEM_BANNERS_FUNCTION}></th> - </tr> + <tr> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_IMPRESION}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_IMPLEFT}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLICKS}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_NCLICKS}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLINAME}></th> + <th class="text-center width10"><{$smarty.const._AM_SYSTEM_BANNERS_FUNCTION}></th> + </tr> </thead> <tbody> - <{foreach item=banner from=$banner}> - <tr class="<{cycle values='even,odd'}>"> - <td class="text-center"><{$banner.impmade}></td> - <td class="text-center"><{$banner.left}></td> - <td class="text-center"><{$banner.clicks}></td> - <td class="text-center"><{$banner.percent}>%</td> - <td class="text-center"><{$banner.name}></td> - <td class="xo-actions text-center"> - <img onclick="display_dialog(<{$banner.bid}>, true, true, 'slide', 'slide', 200, 520);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" /> - <a href="admin.php?fct=banners&op=banner_edit&bid=<{$banner.bid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_EDIT}>"> - <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_EDIT}>" /> - </a> - <a href="admin.php?fct=banners&op=banner_delete&bid=<{$banner.bid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>"> - <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>" /> - </a> - </td> - </tr> - <{/foreach}> + <{foreach item=banner from=$banner}> + <tr class="<{cycle values='even,odd'}>"> + <td class="text-center"><{$banner.impmade}></td> + <td class="text-center"><{$banner.left}></td> + <td class="text-center"><{$banner.clicks}></td> + <td class="text-center"><{$banner.percent}>%</td> + <td class="text-center"><{$banner.name}></td> + <td class="xo-actions text-center"> + <img onclick="display_dialog(<{$banner.bid}>, true, true, 'slide', 'slide', 200, 520);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_VIEW}>" /> + <a href="admin.php?fct=banners&op=banner_edit&bid=<{$banner.bid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_EDIT}>"> + <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_EDIT}>" /> + </a> + <a href="admin.php?fct=banners&op=banner_delete&bid=<{$banner.bid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>"> + <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>" /> + </a> + </td> + </tr> + <{/foreach}> </tbody> </table> <div class="clear spacer"></div> @@ -74,32 +76,32 @@ <h4><{$smarty.const._AM_SYSTEM_BANNERS_FINISHBNR}></h4> <table id="xo-bannersfinish-sorter" class="table table-striped"> <thead> - <tr> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_IMPD}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLICKS}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_NCLICKS}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_STARTDATE}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_ENDDATE}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLINAME}></th> - <th class="text-center width10"><{$smarty.const._AM_SYSTEM_BANNERS_FUNCTION}></th> - </tr> + <tr> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_IMPD}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLICKS}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_NCLICKS}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_STARTDATE}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_ENDDATE}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLINAME}></th> + <th class="text-center width10"><{$smarty.const._AM_SYSTEM_BANNERS_FUNCTION}></th> + </tr> </thead> <tbody> - <{foreach item=banner_finish from=$banner_finish}> - <tr class="<{cycle values='even,odd'}>"> - <td class="text-center"><{$banner_finish.impressions}></td> - <td class="text-center"><{$banner_finish.clicks}></td> - <td class="text-center"><{$banner_finish.percent}>%</td> - <td class="text-center"><{$banner_finish.datestart}></td> - <td class="text-center"><{$banner_finish.dateend}></td> - <td class="text-center"><{$banner_finish.name}></td> - <td class="xo-actions text-center"> - <a href="admin.php?fct=banners&op=banner_finish_delete&bid=<{$banner_finish.bid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>"> - <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>" /> - </a> - </td> - </tr> - <{/foreach}> + <{foreach item=banner_finish from=$banner_finish}> + <tr class="<{cycle values='even,odd'}>"> + <td class="text-center"><{$banner_finish.impressions}></td> + <td class="text-center"><{$banner_finish.clicks}></td> + <td class="text-center"><{$banner_finish.percent}>%</td> + <td class="text-center"><{$banner_finish.datestart}></td> + <td class="text-center"><{$banner_finish.dateend}></td> + <td class="text-center"><{$banner_finish.name}></td> + <td class="xo-actions text-center"> + <a href="admin.php?fct=banners&op=banner_finish_delete&bid=<{$banner_finish.bid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>"> + <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>" /> + </a> + </td> + </tr> + <{/foreach}> </tbody> </table> <div class="clear spacer"></div> @@ -114,31 +116,31 @@ <h4><{$smarty.const._AM_SYSTEM_BANNERS_ADVCLI}></h4> <table id="xo-bannersclient-sorter" class="table table-striped"> <thead> - <tr> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLINAME}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_ACTIVEBNR}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CONTNAME}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CONTMAIL}></th> - <th class="text-center width10"><{$smarty.const._AM_SYSTEM_BANNERS_FUNCTION}></th> - </tr> + <tr> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CLINAME}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_ACTIVEBNR}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CONTNAME}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_BANNERS_CONTMAIL}></th> + <th class="text-center width10"><{$smarty.const._AM_SYSTEM_BANNERS_FUNCTION}></th> + </tr> </thead> <tbody> - <{foreach item=banner_client from=$banner_client}> - <tr class="<{cycle values='even,odd'}>"> - <td class="text-center"><{$banner_client.name}></td> - <td class="text-center"><{$banner_client.banner_active}></td> - <td class="text-center"><{$banner_client.contact}></td> - <td class="text-center"><{$banner_client.email}></td> - <td class="xo-actions text-center"> - <a href="admin.php?fct=banners&op=banner_client_edit&cid=<{$banner_client.cid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_EDIT}>"> - <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_EDIT}>" /> - </a> - <a href="admin.php?fct=banners&op=banner_client_delete&cid=<{$banner_client.cid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>"> - <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>" /> - </a> - </td> - </tr> - <{/foreach}> + <{foreach item=banner_client from=$banner_client}> + <tr class="<{cycle values='even,odd'}>"> + <td class="text-center"><{$banner_client.name}></td> + <td class="text-center"><{$banner_client.banner_active}></td> + <td class="text-center"><{$banner_client.contact}></td> + <td class="text-center"><{$banner_client.email}></td> + <td class="xo-actions text-center"> + <a href="admin.php?fct=banners&op=banner_client_edit&cid=<{$banner_client.cid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_EDIT}>"> + <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_EDIT}>" /> + </a> + <a href="admin.php?fct=banners&op=banner_client_delete&cid=<{$banner_client.cid}>" title="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>"> + <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SYSTEM_BANNERS_DELETE}>" /> + </a> + </td> + </tr> + <{/foreach}> </tbody> </table> <div class="clear spacer"></div> @@ -150,5 +152,5 @@ <br /> <!-- Display Avatar form (add,edit) --> <{if $form}> -<div class="spacer"><{$form}></div> +<div class="form-inline"><{$form}></div> <{/if}> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_blocks.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_blocks.html 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_blocks.html 2015-03-17 10:35:00 UTC (rev 13018) @@ -7,7 +7,7 @@ <{if $filterform}> <div class="pull-right"> <div class="xo-buttons"> - <button id="xo-add-btn" class="btn" onclick="self.location.href='admin.php?fct=blocksadmin&op=add';"> + <button id="xo-add-btn" class="btn btn-default" onclick="self.location.href='admin.php?fct=blocksadmin&op=add';"> <img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._AM_SYSTEM_BLOCKS_ADD}>" /> <{$smarty.const._AM_SYSTEM_BLOCKS_ADD}> </button> @@ -15,92 +15,100 @@ </div> <div class="clear"></div> <div id="xo-block-dragndrop"> - <table class="table table-striped"> - <tr> - <th> - <form name="<{$filterform.name}>" id="<{$filterform.name}>" action="<{$filterform.action}>" method="<{$filterform.method}>" <{$filterform.extra}> > - <div class="xo-blocksfilter"> - <{foreach item=element from=$filterform.elements}> - <{if $element.hidden != true}> - <div class="xo-caption"><{$element.caption}></div> - <div class="xo-element"><{$element.body}></div> - <{else}> - <{$element.body}> - <{/if}> - <{/foreach}> - </div> - </form> - </th> - </tr> - <tr> - <td> - <table id="xo-block-managment" class="table table-striped"> - <tr> - <td side="0" class="xo-blocksection" rowspan="3" id="xo-leftcolumn"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDELEFT}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=0}> - </td> - <td side="3" class="xo-blocksection"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDETOPLEFT}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=3}> - </td> - <td side="5" class="xo-blocksection"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDETOPCENTER}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=5}> - </td> - <td side="4" class="xo-blocksection"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDETOPRIGHT}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=4}> - </td> - <td side="1" class="xo-blocksection" rowspan="3" id="xo-rightcolumn"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDERIGHT}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=1}> - </td> - </tr> - <tr style="height:30px;"> - <td colspan="3" class="xo-blockContent width5"> </td> - </tr> - <tr> - <td side="7" class="xo-blocksection"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEBOTTOMLEFT}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=7}> - </td> - <td side="9" class="xo-blocksection"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEBOTTOMCENTER}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=9}> - </td> - <td side="8" class="xo-blocksection"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEBOTTOMRIGHT}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=8}> - </td> - </tr> - <tr> - <!-- Start Footer Blocks (By Timgno) --> - <table id="xo-block-footer" class="table table-striped"> + <table class="table table-bordered"> + <thead> + <tr> + <th> + <form name="<{$filterform.name}>" id="<{$filterform.name}>" action="<{$filterform.action}>" method="<{$filterform.method}>" <{$filterform.extra}> > + <div class="xo-blocksfilter"> + <{foreach item=element from=$filterform.elements}> + <{if $element.hidden != true}> + <div class="xo-caption"><{$element.caption}></div> + <div class="xo-element"><{$element.body}></div> + <{else}> + <{$element.body}> + <{/if}> + <{/foreach}> + </div> + </form> + </th> + </tr> + </thead> + <tbody> + <tr> + <td> + <table id="xo-block-managment" class="table table-striped"> + <tbody> <tr> - <td side="10" class="xo-blocksection"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEFOOTERLEFT}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=10}> + <td side="0" class="xo-blocksection" rowspan="3" id="xo-leftcolumn"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDELEFT}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=0}> </td> - <td side="12" class="xo-blocksection"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEFOOTERCENTER}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=12}> + <td side="3" class="xo-blocksection"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDETOPLEFT}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=3}> </td> - <td side="11" class="xo-blocksection"> - <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEFOOTERRIGHT}></div> - <{includeq file="db:system_blocks_item.html" blocks=$blocks side=11}> + <td side="5" class="xo-blocksection"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDETOPCENTER}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=5}> </td> + <td side="4" class="xo-blocksection"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDETOPRIGHT}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=4}> + </td> + <td side="1" class="xo-blocksection" rowspan="3" id="xo-rightcolumn"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDERIGHT}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=1}> + </td> </tr> - </table> - <!-- End Footer Blocks (By Timgno) --> - </tr> - </table> - </td> - </tr> + <tr style="height:30px;"> + <td colspan="3" class="xo-blockContent width5"> </td> + </tr> + <tr> + <td side="7" class="xo-blocksection"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEBOTTOMLEFT}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=7}> + </td> + <td side="9" class="xo-blocksection"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEBOTTOMCENTER}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=9}> + </td> + <td side="8" class="xo-blocksection"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEBOTTOMRIGHT}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=8}> + </td> + </tr> + <tr> + <!-- Start Footer Blocks (By Timgno) --> + <table id="xo-block-footer" class="table table-striped"> + <tbody> + <tr> + <td side="10" class="xo-blocksection"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEFOOTERLEFT}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=10}> + </td> + <td side="12" class="xo-blocksection"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEFOOTERCENTER}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=12}> + </td> + <td side="11" class="xo-blocksection"> + <div class="xo-title"><{$smarty.const._AM_SYSTEM_BLOCKS_SIDEFOOTERRIGHT}></div> + <{includeq file="db:system_blocks_item.html" blocks=$blocks side=11}> + </td> + </tr> + </tbody> + </table> + <!-- End Footer Blocks (By Timgno) --> + </tr> + </tbody> + </table> + </td> + </tr> + </tbody> </table> </div> <{/if}> -<div id="xo-block-add" <{if $filterform}>class="hide"<{/if}>> +<div class="form-inline" id="xo-block-add" <{if $filterform}>class="hide"<{/if}>> <{if !$filterform}><br /><{/if}> <{$blockform}> </div> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_comments.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_comments.html 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_comments.html 2015-03-17 10:35:00 UTC (rev 13018) @@ -1,7 +1,7 @@ <{includeq file="db:system_header.html"}> <!--Comments--> <{if $form}> -<div class="spacer"><{$form}></div> +<div class="form-inline"><{$form}></div> <{else}> <div class="pull-left"><{$form_sort}></div> <div class="pull-right"> @@ -15,47 +15,47 @@ <div class="clear"></div> <table id="xo-comment-sorter" class="table table-striped"> <thead> - <tr> - <th class="text-center width5"><input type='checkbox' name='allbox' id='allbox' onclick='xoopsCheckAll("commentslist", "allbox");' value='Check All' /></th> - <th class="text-center width5"></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_TITLE}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_POSTED}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_IP}></th> - <th class="text-center"><{$smarty.const._DATE}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_MODULE}></th> - <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_STATUS}></th> - <th class="text-center width10"><{$smarty.const._AM_SYSTEM_COMMENTS_ACTION}></th> - </tr> - </thead> + <tr> + <th class="text-center width5"><input type='checkbox' name='allbox' id='allbox' onclick='xoopsCheckAll("commentslist", "allbox");' value='Check All' /></th> + <th class="text-center width5"></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_TITLE}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_POSTED}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_IP}></th> + <th class="text-center"><{$smarty.const._DATE}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_MODULE}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_COMMENTS_STATUS}></th> + <th class="text-center width10"><{$smarty.const._AM_SYSTEM_COMMENTS_ACTION}></th> + </tr> + </thead> <form name='commentslist' id='commentslist' action='<{$php_selft}>' method="post"> - <tbody> - <{foreach item=comments from=$comments}> - <tr class="<{cycle values='even,odd'}> alignmiddle"> - <td class="text-center"><input type='checkbox' name='commentslist_id[]' id='commentslist_id[]' value='<{$comments.comments_id}>'/></td> - <td class="text-center"><{$comments.comments_icon}></td> - <td><{$comments.comments_title}></td> - <td class="text-center"><{$comments.comments_poster}></td> - <td class="text-center"><{$comments.comments_ip}></td> - <td class="text-center"><{$comments.comments_date}></td> - <td class="text-center"><{$comments.comments_modid}></td> - <td class="text-center"><{$comments.comments_status}></td> - <td class="xo-actions text-center"> - <img class="cursorpointer" onclick="display_dialog('<{$comments.comments_id}>', true, true, 'slide', 'slide', 300, 500);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" /> - <a href="admin/comments/comment_edit.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._EDIT}>"> - <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>"> - </a> - <a href="admin/comments/comment_delete.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._DELETE}>"> - <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>"> - </a> - </td> - </tr> - <{/foreach}> - </tbody> - <tr> - <td><input type='submit' class="btn btn-danger" name='<{$smarty.const._DELETE}>' value='<{$smarty.const._DELETE}>' /></td> - <td colspan="7"> </td> - </tr> - </form> + <tbody> + <{foreach item=comments from=$comments}> + <tr class="<{cycle values='even,odd'}> alignmiddle"> + <td class="text-center"><input type='checkbox' name='commentslist_id[]' id='commentslist_id[]' value='<{$comments.comments_id}>'/></td> + <td class="text-center"><{$comments.comments_icon}></td> + <td><{$comments.comments_title}></td> + <td class="text-center"><{$comments.comments_poster}></td> + <td class="text-center"><{$comments.comments_ip}></td> + <td class="text-center"><{$comments.comments_date}></td> + <td class="text-center"><{$comments.comments_modid}></td> + <td class="text-center"><{$comments.comments_status}></td> + <td class="xo-actions text-center"> + <img class="cursorpointer" onclick="display_dialog('<{$comments.comments_id}>', true, true, 'slide', 'slide', 300, 500);" src="<{xoAdminIcons display.png}>" alt="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" title="<{$smarty.const._AM_SYSTEM_COMMENTS_VIEW}>" /> + <a href="admin/comments/comment_edit.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._EDIT}>"> + <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._EDIT}>"> + </a> + <a href="admin/comments/comment_delete.php?com_id=<{$comments.comments_id}>" title="<{$smarty.const._DELETE}>"> + <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._DELETE}>"> + </a> + </td> + </tr> + <{/foreach}> + <tr> + <td><input type='submit' class="btn btn-danger" name='<{$smarty.const._DELETE}>' value='<{$smarty.const._DELETE}>' /></td> + <td colspan="7"> </td> + </tr> + </tbody> + </form> </table> <{foreach item=comments from=$comments_popup}> <!--Pop-pup--> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_groups.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_groups.html 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_groups.html 2015-03-17 10:35:00 UTC (rev 13018) @@ -3,7 +3,7 @@ <{if $groups_count == true}> <div class="pull-right"> <div class="xo-buttons"> - <button class="ui-corner-all btn" onclick="self.location.href='admin.php?fct=groups&op=groups_add'"> + <button class="btn btn-default" onclick="self.location.href='admin.php?fct=groups&op=groups_add'"> <img src="<{xoAdminIcons add.png}>" alt="<{$smarty.const._AM_SYSTEM_GROUPS_ADD}>" /> <{$smarty.const._AM_SYSTEM_GROUPS_ADD}> </button> @@ -12,32 +12,32 @@ <table id="xo-group-sorter" class="table table-striped tablesorter"> <thead> <tr> - <th class="txtcenter width5"><{$smarty.const._AM_SYSTEM_GROUPS_ID}></th> - <th class="txtcenter width20"><{$smarty.const._AM_SYSTEM_GROUPS_NAME}></th> - <th class="txtcenter"><{$smarty.const._AM_SYSTEM_GROUPS_DESCRIPTION}></th> - <th class="txtcenter"><{$smarty.const._AM_SYSTEM_GROUPS_NB_USERS_BY_GROUPS}></th> - <th class="txtcenter width10"><{$smarty.const._AM_SYSTEM_GROUPS_ACTION}></th> + <th class="text-center width5"><{$smarty.const._AM_SYSTEM_GROUPS_ID}></th> + <th class="text-center width20"><{$smarty.const._AM_SYSTEM_GROUPS_NAME}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_GROUPS_DESCRIPTION}></th> + <th class="text-center"><{$smarty.const._AM_SYSTEM_GROUPS_NB_USERS_BY_GROUPS}></th> + <th class="text-center width10"><{$smarty.const._AM_SYSTEM_GROUPS_ACTION}></th> </tr> </thead> <tbody> <{foreach item=groups from=$groups}> <tr class="<{cycle values='odd, even'}> alignmiddle"> - <td class="txtcenter"><{$groups.groups_id}></td> - <td class="txtleft"> - <a class="tooltip" href="admin.php?fct=groups&op=groups_edit&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>"> + <td class="text-center"><{$groups.groups_id}></td> + <td class="text-left"> + <a href="admin.php?fct=groups&op=groups_edit&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>"> <{$groups.name}> </a> </td> - <td class="txtleft"><{$groups.description}></td> - <td class="txtcenter width25"> + <td class="text-left"><{$groups.description}></td> + <td class="text-center width25"> <a href="./admin.php?fct=users&selgroups=<{$groups.groups_id}>"><{$groups.nb_users_by_groups}></a> </td> - <td class="xo-actions txtcenter"> - <a class="tooltip" href="admin.php?fct=groups&op=groups_edit&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>"> + <td class="xo-actions text-center"> + <a href="admin.php?fct=groups&op=groups_edit&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>"> <img src="<{xoAdminIcons edit.png}>" alt="<{$smarty.const._AM_SYSTEM_GROUPS_EDIT}>" /> </a> <{if $groups.delete}> - <a class="tooltip" href="admin.php?fct=groups&op=groups_delete&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_DELETE}>"> + <a href="admin.php?fct=groups&op=groups_delete&groups_id=<{$groups.groups_id}>" title="<{$smarty.const._AM_SYSTEM_GROUPS_DELETE}>"> <img src="<{xoAdminIcons delete.png}>" alt="<{$smarty.const._AM_SYSTEM_GROUPS_DELETE}>" /> </a> <{/if}> @@ -54,5 +54,5 @@ <{/if}> <!-- Display groups form (add,edit) --> <{if $form}> -<div class="spacer"><{$form}></div> +<div class="form-inline"><{$form}></div> <{/if}> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_help.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_help.html 2015-03-16 10:31:53 UTC (rev 13017) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_help... [truncated message content] |
From: <txm...@us...> - 2015-03-16 10:32:00
|
Revision: 13017 http://sourceforge.net/p/xoops/svn/13017 Author: txmodxoops Date: 2015-03-16 10:31:53 +0000 (Mon, 16 Mar 2015) Log Message: ----------- Updated Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/english/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_page.html Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php 2015-03-14 18:51:12 UTC (rev 13016) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php 2015-03-16 10:31:53 UTC (rev 13017) @@ -301,7 +301,7 @@ } return; } - + $item_id = 1; foreach ($mods as $mod) { $sadmin = $moduleperm_handler->checkRight ( 'module_admin', $mod->getVar ( 'mid' ), $xoopsUser->getGroups () ); if ($sadmin) { @@ -312,6 +312,7 @@ } else { $rtn ['link'] = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mod->getVar ( 'mid' ); } + $rtn ['id'] = $item_id; $rtn ['title'] = htmlspecialchars($mod->getVar ('name'), ENT_QUOTES); $rtn ['image'] = $mod->getInfo('image'); $rtn ['description'] = $mod->getInfo('description'); @@ -323,7 +324,9 @@ } $tpl->append ( 'modules', $rtn ); } + $item_id++; } + unset($item_id); } /*function footer() Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/english/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/english/admin.php 2015-03-14 18:51:12 UTC (rev 13016) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/english/admin.php 2015-03-16 10:31:53 UTC (rev 13017) @@ -2,6 +2,10 @@ // $Id: admin.php 12609 2014-06-16 06:30:00Z beckmi $ define('_OXYGEN_SYSOPTIONS',"System Options"); define('_OXYGEN_INSTALLEDMODULES',"Installed Modules"); +define('_OXYGEN_INSTALLEDMODULES_NUM',"N°"); +define('_OXYGEN_INSTALLEDMODULES_IMAGE',"Image"); +define('_OXYGEN_INSTALLEDMODULES_NAME',"Name"); +define('_OXYGEN_INSTALLEDMODULES_DESCRIPTION',"Description"); define('_OXYGEN_XOOPSTHEMES',"XOOPS Themes"); define('_OXYGEN_XOOPSMODULES',"XOOPS Modules"); define('_OXYGEN_INTERESTSITES',"Links"); Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html 2015-03-14 18:51:12 UTC (rev 13016) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html 2015-03-16 10:31:53 UTC (rev 13017) @@ -1,8 +1,14 @@ <table class="table table-striped"> <thead> <tr> - <th colspan="4"><{$smarty.const._OXYGEN_INSTALLEDMODULES}></th> + <h4 colspan="4"><{$smarty.const._OXYGEN_INSTALLEDMODULES}></h4> </tr> + <tr> + <th class="text-center"><{$smarty.const._OXYGEN_INSTALLEDMODULES_NUM}></th> + <th class="text-center"><{$smarty.const._OXYGEN_INSTALLEDMODULES_IMAGE}></th> + <th class="text-center"><{$smarty.const._OXYGEN_INSTALLEDMODULES_NAME}></th> + <th class="text-center"><{$smarty.const._OXYGEN_INSTALLEDMODULES_DESCRIPTION}></th> + </tr> </thead> <tbody> <{foreach item=mod from=$modules}> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_page.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_page.html 2015-03-14 18:51:12 UTC (rev 13016) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_page.html 2015-03-16 10:31:53 UTC (rev 13017) @@ -3,7 +3,7 @@ <hr /> <div class="row"> <!-- center left--> - <div class="col-md-9"> + <div class="col-md-12"> <{if $xo_sys_breadcrumb}> <div class="row"> <div class="col-lg-12"> @@ -31,21 +31,20 @@ <{/if}> <{if $modules}> <div class="row"> - <div class="col-lg-12"> + <div class="col-lg-9"> <div class="panel panel-default"> <div class="panel-body"> <{includeq file="$theme_tpl/theme_modules.html"}> </div> </div> </div> - </div><{* /.row *}> - <hr /> - <{/if}> - </div><!--/col--> - <!--center-right--> - <div class="col-md-3"> - <{includeq file="$theme_tpl/theme_tabs.html"}> - <hr /> - <{includeq file="$theme_tpl/theme_accordion.html"}> - </div><!--/col-span-3--> + <!--center-right--> + <div class="col-md-3"> + <{includeq file="$theme_tpl/theme_tabs.html"}> + <hr /> + <{includeq file="$theme_tpl/theme_accordion.html"}> + </div><!--/col--> + </div><{* /.row *}><hr /> + <{/if}> + </div><!--/col-span-12--> </div><!--/row--> \ No newline at end of file |
From: <txm...@us...> - 2015-03-14 18:51:16
|
Revision: 13016 http://sourceforge.net/p/xoops/svn/13016 Author: txmodxoops Date: 2015-03-14 18:51:12 +0000 (Sat, 14 Mar 2015) Log Message: ----------- Updated profile module with .tpl extension templates Captcha and Recaptcha Modificed admin protector for bootstrap Deleted .html templates files Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/captcha/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/captcha/config.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/captcha/config.recaptcha.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/activate.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/about.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/admin_footer.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/admin_header.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/category.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/deactivate.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/field.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/index.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/menu.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/permissions.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/step.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/user.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/visibility.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/css/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/css/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/css/style.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/actions/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/actions/0.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/actions/1.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/actions/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/left_both.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/logo.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/modadminbg.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/no.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/right_both.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/images/yes.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/js/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/assets/js/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changemail.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/changepass.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/class/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/class/category.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/class/field.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/class/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/class/profile.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/class/regstep.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/class/visibility.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/docs/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/docs/changelog.txt XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/docs/credits.txt XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/docs/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/docs/install.txt XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/docs/lang_diff.txt XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/docs/licence.txt XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/docs/readme.txt XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/edituser.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/footer.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/header.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/include/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/include/forms.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/include/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/include/install.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/include/update.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/index.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/help/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/help/help.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/help/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/mail_template/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/mail_template/emailchanged.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/mail_template/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/main.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/english/modinfo.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/language/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/lostpass.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/preloads/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/preloads/core.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/preloads/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/register.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/search.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/sql/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/sql/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/sql/mysql.sql XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_admin_categorylist.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_admin_fieldlist.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_admin_steplist.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_admin_visibility.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_avatar.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_breadcrumbs.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_changepass.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_editprofile.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_email.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_form.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_register.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_results.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_search.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_userform.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_userinfo.tpl XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/user.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/userinfo.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/xoops_version.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/xoops_lib/modules/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/xoops_lib/modules/protector/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/xoops_lib/modules/protector/admin/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/xoops_lib/modules/protector/admin/center.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/xoops_lib/modules/protector/admin/prefix_manager.php Removed Paths: ------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_admin_categorylist.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_admin_fieldlist.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_admin_steplist.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_admin_visibility.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_avatar.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_breadcrumbs.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_changepass.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_editprofile.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_email.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_form.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_register.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_results.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_search.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_userform.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/templates/profile_userinfo.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bccenter.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bcleft.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bcright.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bleft.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bright.html Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/captcha/config.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/captcha/config.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/captcha/config.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,33 @@ +<?php +/** + * CAPTCHA configurations for All modes + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package class + * @subpackage CAPTCHA + * @since 2.3.0 + * @author Taiwen Jiang <ph...@us...> + * @version $Id: config.php 12666 2014-06-30 10:02:07Z beckmi $ + */ + +defined('XOOPS_ROOT_PATH') || die('Restricted access'); + +/** + * This keeping config in files has really got to stop. If we can't actually put these into + * the actual XOOPS config then we should do this. (Who said this? You are right!) + */ +return $config = array( + 'disabled' => $GLOBALS['xoopsModuleConfig']['captcha_disabled'], // Disable CAPTCHA false + 'mode' => $GLOBALS['xoopsModuleConfig']['captcha_mode'], // default mode, you can choose 'text', 'image', 'recaptcha'(requires api key) + 'name' => $GLOBALS['xoopsModuleConfig']['captcha_name'], // default captcha name xoopscaptcha + 'skipmember' => $GLOBALS['xoopsModuleConfig']['captcha_skipmember'], // Skip CAPTCHA check for members true + 'maxattempts' => $GLOBALS['xoopsModuleConfig']['captcha_maxattempts'], // Maximum attempts for each session default 10 +); Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/captcha/config.recaptcha.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/captcha/config.recaptcha.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/captcha/config.recaptcha.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,28 @@ +<?php +/** + * CAPTCHA configurations for Recaptcha mode + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package class + * @subpackage CAPTCHA + * @since 2.5.2 + * @author trabis <lus...@gm...> + * @version $Id: config.recaptcha.php 13018 2015-03-15 18:32:47Z timgno $ + */ + +defined('XOOPS_ROOT_PATH') || die('Restricted access'); + +return $config = array( + 'private_key' => $GLOBALS['xoopsModuleConfig']['recaptcha_private_apikey'], //'YourPrivateApiKey' + 'public_key' => $GLOBALS['xoopsModuleConfig']['recaptcha_public_apikey'], //'YourPublicApiKey', + 'theme' => $GLOBALS['xoopsModuleConfig']['recaptcha_theme'], // 'red' | 'white' | 'blackglass' | 'clean' | 'custom' + 'lang' => _LANGCODE + ); Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php 2015-03-14 11:55:46 UTC (rev 13015) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -16,7 +16,7 @@ * @since 2.3.0 * @package kernel * @subpackage xos_opal_Theme - * @version $Id: theme.php 12666 2014-06-30 10:02:07Z beckmi $ + * @version $Id: theme.php 13015 2015-03-14 12:56:47Z timgno $ */ defined('XOOPS_ROOT_PATH') || die('Restricted access'); Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/activate.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/activate.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/activate.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,109 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: activate.php 12033 2013-09-14 03:16:44Z beckmi $ + */ + +$xoopsOption['pagetype'] = "user"; +include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'header.php'; + +include $GLOBALS['xoops']->path('header.php'); +if (!empty($_GET['id']) && !empty($_GET['actkey'])) { + $id = intval($_GET['id']); + $actkey = trim($_GET['actkey']); + if (empty($id)) { + redirect_header(XOOPS_URL, 1, ''); + exit(); + } + $member_handler =& xoops_gethandler('member'); + $thisuser =& $member_handler->getUser($id); + if (!is_object($thisuser)) { + redirect_header(XOOPS_URL, 1, ''); + exit(); + } + if ($thisuser->getVar('actkey') != $actkey) { + redirect_header(XOOPS_URL . '/', 5, _US_ACTKEYNOT); + } else { + if ($thisuser->getVar('level') > 0) { + redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n'). '/index.php', 5, _US_ACONTACT, false); + } else { + if (false != $member_handler->activateUser($thisuser)) { + $config_handler =& xoops_gethandler('config'); + $GLOBALS['xoopsConfigUser'] = $config_handler->getConfigsByCat(XOOPS_CONF_USER); + if ($GLOBALS['xoopsConfigUser']['activation_type'] == 2) { + $myts =& MyTextSanitizer::getInstance(); + $xoopsMailer = xoops_getMailer(); + $xoopsMailer->useMail(); + $xoopsMailer->setTemplate('activated.tpl'); + $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']); + $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']); + $xoopsMailer->assign('SITEURL', XOOPS_URL . "/"); + $xoopsMailer->setToUsers($thisuser); + $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']); + $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']); + $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $GLOBALS['xoopsConfig']['sitename']) ); + include $GLOBALS['xoops']->path('header.php'); + if (!$xoopsMailer->send()) { + printf(_US_ACTVMAILNG, $thisuser->getVar('uname') ); + } else { + printf(_US_ACTVMAILOK, $thisuser->getVar('uname') ); + } + include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php'; + } else { + redirect_header(XOOPS_URL . '/user.php', 5, _US_ACTLOGIN, false); + } + } else { + redirect_header(XOOPS_URL . '/index.php', 5, 'Activation failed!'); + } + } + } +// Not implemented yet: re-send activiation code +} else if (!empty($_REQUEST['email']) && $xoopsConfigUser['activation_type'] != 0) { + $myts =& MyTextSanitizer::getInstance(); + $member_handler =& xoops_gethandler('member'); + $getuser =& $member_handler->getUsers(new Criteria('email', $myts->addSlashes(trim($_REQUEST['email'])))); + if (count($getuser) == 0) { + redirect_header(XOOPS_URL, 2, _US_SORRYNOTFOUND); + } + if ($getuser[0]->isActive()) { + redirect_header(XOOPS_URL, 2, sprintf(_US_USERALREADYACTIVE, $getuser[0]->getVar('email'))); + } + $xoopsMailer =& xoops_getMailer(); + $xoopsMailer->useMail(); + $xoopsMailer->setTemplate('register.tpl'); + $xoopsMailer->assign('SITENAME', $GLOBALS['xoopsConfig']['sitename']); + $xoopsMailer->assign('ADMINMAIL', $GLOBALS['xoopsConfig']['adminmail']); + $xoopsMailer->assign('SITEURL', XOOPS_URL . "/"); + $xoopsMailer->setToUsers($getuser[0]); + $xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']); + $xoopsMailer->setFromName($GLOBALS['xoopsConfig']['sitename']); + $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $getuser[0]->getVar('uname') )); + if (!$xoopsMailer->send()) { + echo _US_YOURREGMAILNG; + } else { + echo _US_YOURREGISTERED; + } +} else { + include_once $GLOBALS['xoops']->path('class/xoopsformloader.php'); + $form = new XoopsThemeForm('', 'form', 'activate.php'); + $form->addElement(new XoopsFormText(_US_EMAIL, 'email', 25, 255) ); + $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit') ); + $form->display(); +} + +$xoBreadcrumbs[] = array('title' => _PROFILE_MA_REGISTER); +include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'footer.php'; Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/about.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/about.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/about.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,31 @@ +<?php +/** + * XOOPS Profile module + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project (http://www.xoops.org) + * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/) + * @package xoopsPoll + * @since 2.5.0 + * @author Mage, Mamba + * @version $Id $ + **/ + +include '../../../include/cp_header.php'; +include 'admin_header.php'; +xoops_cp_header(); + +$module_info =& $module_handler->get($xoopsModule->getVar("mid")); + +$aboutAdmin = new ModuleAdmin(); + +echo $aboutAdmin->addNavigation('about.php'); +echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); + +include 'admin_footer.php'; Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/admin_footer.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/admin_footer.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/admin_footer.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,27 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: admin_footer.php 13016 2015-03-15 18:21:22Z timgno $ + */ +echo "<div class='adminfooter'>\n" + ." <div style='text-align: center;'>\n" + ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" + ." </div>\n" + ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" + ."</div>"; + +xoops_cp_footer(); Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/admin_header.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/admin_header.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/admin_header.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,54 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package profile + * @since 2.3.0 + * @author Taiwen Jiang <ph...@us...> + * @version $Id: admin_header.php 12363 2014-03-08 10:39:06Z beckmi $ + */ + +$path = dirname(dirname(dirname(dirname(__FILE__)))); +include_once $path . '/mainfile.php'; +include_once $path . '/include/cp_functions.php'; +require_once $path . '/include/cp_header.php'; + +global $xoopsModule; + +$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname'); + +//if functions.php file exist +//require_once dirname(dirname(__FILE__)) . '/include/functions.php'; + +// Load language files +xoops_loadLanguage('admin', $thisModuleDir); +xoops_loadLanguage('modinfo', $thisModuleDir); +xoops_loadLanguage('main', $thisModuleDir); + +$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); +$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); +$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin'); + +$myts =& MyTextSanitizer::getInstance(); + +if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { + include_once XOOPS_ROOT_PATH . "/class/template.php"; + $xoopsTpl = new XoopsTpl(); +} + +include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'); + +xoops_loadLanguage('user'); +if ( !isset($GLOBALS['xoopsTpl']) || !is_object($GLOBALS['xoopsTpl']) ) { + include_once $GLOBALS['xoops']->path( "/class/template.php" ); + $GLOBALS['xoopsTpl'] = new XoopsTpl(); +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/category.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/category.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/category.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,96 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: permissions.php 13016 2015-03-15 18:21:22Z timgno $ + */ +include 'admin_header.php'; +xoops_cp_header(); +$indexAdmin = new ModuleAdmin(); + +$indexAdmin->addItemButton(_ADD . ' ' . _AM_PROFILE_CATEGORY, 'category.php?op=new', 'add', ''); + +echo $indexAdmin->addNavigation('category.php'); +echo $indexAdmin->renderButton('right', ''); + +$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list'); + +$handler =& xoops_getmodulehandler('category'); +switch ($op) { +default: +case "list": + $criteria = new CriteriaCompo(); + $criteria->setSort('cat_weight'); + $criteria->setOrder('ASC'); + $GLOBALS['xoopsTpl']->assign('categories', $handler->getObjects($criteria, true, false) ); + $template_main = "profile_admin_categorylist.tpl"; + break; + +case "new": + include_once '../include/forms.php'; + $obj =& $handler->create(); + $form = $obj->getForm(); + $form->display(); + break; + +case "edit": + include_once '../include/forms.php'; + $obj = $handler->get($_REQUEST['id']); + $form = $obj->getForm(); + $form->display(); + break; + +case "save": + if ( !$GLOBALS['xoopsSecurity']->check() ) { + redirect_header('category.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() )); + } + if ( isset($_REQUEST['id']) ) { + $obj =& $handler->get($_REQUEST['id']); + } else { + $obj =& $handler->create(); + } + $obj->setVar('cat_title', $_REQUEST['cat_title']); + $obj->setVar('cat_description', $_REQUEST['cat_description']); + $obj->setVar('cat_weight', $_REQUEST['cat_weight']); + if ( $handler->insert($obj) ) { + redirect_header('category.php', 3, sprintf(_AM_PROFILE_SAVEDSUCCESS, _AM_PROFILE_CATEGORY) ); + } + include_once '../include/forms.php'; + echo $obj->getHtmlErrors(); + $form =& $obj->getForm(); + $form->display(); + break; + +case "delete": + $obj =& $handler->get($_REQUEST['id']); + if ( isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1 ) { + if ( !$GLOBALS['xoopsSecurity']->check() ) { + redirect_header('category.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() )); + } + if ( $handler->delete($obj) ) { + redirect_header('category.php', 3, sprintf(_AM_PROFILE_DELETEDSUCCESS, _AM_PROFILE_CATEGORY) ); + } else { + echo $obj->getHtmlErrors(); + } + } else { + xoops_confirm(array('ok' => 1, 'id' => $_REQUEST['id'], 'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_PROFILE_RUSUREDEL, $obj->getVar('cat_title') )); + } + break; +} +if ( isset($template_main) ) { + $GLOBALS['xoopsTpl']->display("db:{$template_main}"); +} +include 'admin_footer.php'; Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/deactivate.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/deactivate.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/deactivate.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,31 @@ +<?php +include 'admin_header.php'; +xoops_cp_header(); + +if ( !isset($_REQUEST['uid']) ) { + redirect_header("index.php", 2, _PROFILE_AM_NOSELECTION); +} +$member_handler = xoops_gethandler('member'); +$user = $member_handler->getUser($_REQUEST['uid']); +if ( !$user || $user->isNew() ) { + redirect_header("index.php", 2, _PROFILE_AM_USERDONEXIT); +} + +if ( in_array(XOOPS_GROUP_ADMIN, $user->getGroups() ) ) { + redirect_header("index.php", 2, _PROFILE_AM_CANNOTDEACTIVATEWEBMASTERS); +} +$user->setVar('level', $_REQUEST['level']); +if ( $member_handler->insertUser($user) ) { + if ( $_REQUEST['level'] == 1 ) { + $message = _PROFILE_AM_USER_ACTIVATED; + } else { + $message = _PROFILE_AM_USER_DEACTIVATED; + } +} else { + if ( $_REQUEST['level'] == 1 ) { + $message = _PROFILE_AM_USER_NOT_ACTIVATED; + } else { + $message = _PROFILE_AM_USER_NOT_DEACTIVATED; + } +} +redirect_header("../userinfo.php?uid=" . $user->getVar('uid'), 3, $message); Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/field.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/field.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/field.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,338 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: field.php 13016 2015-03-15 18:21:22Z timgno $ + */ +include 'admin_header.php'; +xoops_cp_header(); +$indexAdmin = new ModuleAdmin(); + +$indexAdmin->addItemButton(_ADD . ' ' . _AM_PROFILE_FIELD, 'field.php?op=new', 'add', ''); + +echo $indexAdmin->addNavigation('field.php'); +echo $indexAdmin->renderButton('right', ''); + +$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : (isset($_REQUEST['id']) ? "edit" : 'list'); + +$profilefield_handler =& xoops_getmodulehandler('field'); + +switch ($op) { + default: + case "list": + $fields = $profilefield_handler->getObjects(null, true, false); + + $module_handler =& xoops_gethandler('module'); + $modules = $module_handler->getObjects(null, true); + + $cat_handler =& xoops_getmodulehandler('category'); + $criteria = new CriteriaCompo(); + $criteria->setSort('cat_weight'); + $cats = $cat_handler->getObjects($criteria, true); + unset($criteria); + + $categories[0] = _AM_PROFILE_DEFAULT; + if (count($cats) > 0) { + foreach (array_keys($cats) as $i) { + $categories[$cats[$i]->getVar('cat_id')] = $cats[$i]->getVar('cat_title'); + } + } + $GLOBALS['xoopsTpl']->assign('categories', $categories); + unset($categories); + $valuetypes = array( XOBJ_DTYPE_ARRAY => _AM_PROFILE_ARRAY, + XOBJ_DTYPE_EMAIL => _AM_PROFILE_EMAIL, + XOBJ_DTYPE_INT => _AM_PROFILE_INT, + XOBJ_DTYPE_TXTAREA => _AM_PROFILE_TXTAREA, + XOBJ_DTYPE_TXTBOX => _AM_PROFILE_TXTBOX, + XOBJ_DTYPE_URL => _AM_PROFILE_URL, + XOBJ_DTYPE_OTHER => _AM_PROFILE_OTHER, + XOBJ_DTYPE_MTIME => _AM_PROFILE_DATE ); + + $fieldtypes = array('checkbox' => _AM_PROFILE_CHECKBOX, + 'group' => _AM_PROFILE_GROUP, + 'group_multi' => _AM_PROFILE_GROUPMULTI, + 'language' => _AM_PROFILE_LANGUAGE, + 'radio' => _AM_PROFILE_RADIO, + 'select' => _AM_PROFILE_SELECT, + 'select_multi' => _AM_PROFILE_SELECTMULTI, + 'textarea' => _AM_PROFILE_TEXTAREA, + 'dhtml' => _AM_PROFILE_DHTMLTEXTAREA, + 'textbox' => _AM_PROFILE_TEXTBOX, + 'timezone' => _AM_PROFILE_TIMEZONE, + 'yesno' => _AM_PROFILE_YESNO, + 'date' => _AM_PROFILE_DATE, + 'datetime' => _AM_PROFILE_DATETIME, + 'longdate' => _AM_PROFILE_LONGDATE, + 'theme' => _AM_PROFILE_THEME, + 'autotext' => _AM_PROFILE_AUTOTEXT, + 'rank' => _AM_PROFILE_RANK); + + foreach (array_keys($fields) as $i) { + $fields[$i]['canEdit']=$fields[$i]['field_config'] || $fields[$i]['field_show'] || $fields[$i]['field_edit']; + $fields[$i]['canDelete'] = $fields[$i]['field_config']; + $fields[$i]['fieldtype'] = $fieldtypes[$fields[$i]['field_type']]; + $fields[$i]['valuetype'] = $valuetypes[$fields[$i]['field_valuetype']]; + $categories[$fields[$i]['cat_id']][] = $fields[$i]; + $weights[$fields[$i]['cat_id']][] = $fields[$i]['field_weight']; + + } + //sort fields order in categories + foreach (array_keys($categories) as $i) { + array_multisort($weights[$i], SORT_ASC, array_keys($categories[$i]), SORT_ASC, $categories[$i]); + } + ksort($categories); + $GLOBALS['xoopsTpl']->assign('fieldcategories', $categories); + $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML()); + $template_main = "profile_admin_fieldlist.tpl"; + break; + + case "new": + include_once '../include/forms.php'; + $obj =& $profilefield_handler->create(); + $form = profile_getFieldForm($obj); + $form->display(); + break; + + case "edit": + $obj =& $profilefield_handler->get($_REQUEST['id']); + if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist + redirect_header('field.php', 2, _AM_PROFILE_FIELDNOTCONFIGURABLE); + } + include_once '../include/forms.php'; + $form = profile_getFieldForm($obj); + $form->display(); + break; + + case "reorder": + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + if (isset($_POST['field_ids']) && count($_POST['field_ids']) > 0) { + $oldweight = $_POST['oldweight']; + $oldcat = $_POST['oldcat']; + $category = $_POST['category']; + $weight = $_POST['weight']; + $ids = array(); + foreach ($_POST['field_ids'] as $field_id) { + if ($oldweight[$field_id] != $weight[$field_id] || $oldcat[$field_id] != $category[$field_id]) { + //if field has changed + $ids[] = intval($field_id); + } + } + if (count($ids) > 0) { + $errors = array(); + //if there are changed fields, fetch the fieldcategory objects + $field_handler =& xoops_getmodulehandler('field'); + $fields = $field_handler->getObjects(new Criteria('field_id', "(" . implode(',', $ids) . ")", "IN"), true); + foreach ($ids as $i) { + $fields[$i]->setVar('field_weight', intval($weight[$i])); + $fields[$i]->setVar('cat_id', intval($category[$i])); + if (!$field_handler->insert($fields[$i])) { + $errors = array_merge($errors, $fields[$i]->getErrors()); + } + } + if (count($errors) == 0) { + //no errors + redirect_header('field.php', 2, sprintf(_AM_PROFILE_SAVEDSUCCESS, _AM_PROFILE_FIELDS)); + } else { + redirect_header('field.php', 3, implode('<br />', $errors)); + } + } + } + break; + + case "save": + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + $redirect_to_edit = false; + if (isset($_REQUEST['id'])) { + $obj =& $profilefield_handler->get($_REQUEST['id']); + if (!$obj->getVar('field_config') && !$obj->getVar('field_show') && !$obj->getVar('field_edit')) { //If no configs exist + redirect_header('admin.php', 2, _AM_PROFILE_FIELDNOTCONFIGURABLE); + } + } else { + $obj =& $profilefield_handler->create(); + $obj->setVar('field_name', $_REQUEST['field_name']); + $obj->setVar('field_moduleid', $GLOBALS['xoopsModule']->getVar('mid')); + $obj->setVar('field_show', 1); + $obj->setVar('field_edit', 1); + $obj->setVar('field_config', 1); + $redirect_to_edit = true; + } + $obj->setVar('field_title', $_REQUEST['field_title']); + $obj->setVar('field_description', $_REQUEST['field_description']); + if ($obj->getVar('field_config')) { + $obj->setVar('field_type', $_REQUEST['field_type']); + if (isset($_REQUEST['field_valuetype'])) { + $obj->setVar('field_valuetype', $_REQUEST['field_valuetype']); + } + $options = $obj->getVar('field_options'); + + if (isset($_REQUEST['removeOptions']) && is_array($_REQUEST['removeOptions'])) { + foreach ($_REQUEST['removeOptions'] as $index) { + unset($options[$index]); + } + $redirect_to_edit = true; + } + + if (!empty($_REQUEST['addOption'])) { + foreach ($_REQUEST['addOption'] as $option) { + if (empty($option['value'])) continue; + $options[$option['key']] = $option['value']; + $redirect_to_edit = true; + } + } + $obj->setVar('field_options', $options); + } + if ($obj->getVar('field_edit')) { + $required = isset($_REQUEST['field_required']) ? $_REQUEST['field_required'] : 0; + $obj->setVar('field_required', $required); //0 = no, 1 = yes + if (isset($_REQUEST['field_maxlength'])) { + $obj->setVar('field_maxlength', $_REQUEST['field_maxlength']); + } + if (isset($_REQUEST['field_default'])) { + $field_default = $obj->getValueForSave($_REQUEST['field_default']); + //Check for multiple selections + if (is_array($field_default)) { + $obj->setVar('field_default', serialize($field_default)); + } else { + $obj->setVar('field_default', $field_default); + } + } + } + + if ($obj->getVar('field_show')) { + $obj->setVar('field_weight', $_REQUEST['field_weight']); + $obj->setVar('cat_id', $_REQUEST['field_category']); + } + if ( /*$obj->getVar('field_edit') && */isset($_REQUEST['step_id']) ) { + $obj->setVar('step_id', $_REQUEST['step_id']); + } + if ($profilefield_handler->insert($obj)) { + $groupperm_handler =& xoops_gethandler('groupperm'); + + $perm_arr = array(); + if ($obj->getVar('field_show')) { + $perm_arr[] = 'profile_show'; + $perm_arr[] = 'profile_visible'; + } + if ($obj->getVar('field_edit')) { + $perm_arr[] = 'profile_edit'; + } + if ($obj->getVar('field_edit') || $obj->getVar('field_show')) { + $perm_arr[] = 'profile_search'; + } + if (count($perm_arr) > 0) { + foreach ($perm_arr as $perm) { + $criteria = new CriteriaCompo(new Criteria('gperm_name', $perm)); + $criteria->add(new Criteria('gperm_itemid', intval($obj->getVar('field_id')))); + $criteria->add(new Criteria('gperm_modid', intval($GLOBALS['xoopsModule']->getVar('mid')))); + if (isset($_REQUEST[$perm]) && is_array($_REQUEST[$perm])) { + $perms = $groupperm_handler->getObjects($criteria); + if (count($perms) > 0) { + foreach (array_keys($perms) as $i) { + $groups[$perms[$i]->getVar('gperm_groupid')] =& $perms[$i]; + } + } else { + $groups = array(); + } + foreach ($_REQUEST[$perm] as $groupid) { + $groupid = intval($groupid); + if (!isset($groups[$groupid])) { + $perm_obj =& $groupperm_handler->create(); + $perm_obj->setVar('gperm_name', $perm); + $perm_obj->setVar('gperm_itemid', intval($obj->getVar('field_id'))); + $perm_obj->setVar('gperm_modid', $GLOBALS['xoopsModule']->getVar('mid')); + $perm_obj->setVar('gperm_groupid', $groupid); + $groupperm_handler->insert($perm_obj); + unset($perm_obj); + } + } + $removed_groups = array_diff(array_keys($groups), $_REQUEST[$perm]); + if (count($removed_groups) > 0) { + $criteria->add(new Criteria('gperm_groupid', "(" . implode(',', $removed_groups) . ")", "IN")); + $groupperm_handler->deleteAll($criteria); + } + unset($groups); + + } else { + $groupperm_handler->deleteAll($criteria); + } + unset($criteria); + } + } + $url = $redirect_to_edit ? 'field.php?op=edit&id=' . $obj->getVar('field_id') : 'field.php'; + redirect_header($url, 3, sprintf(_AM_PROFILE_SAVEDSUCCESS, _AM_PROFILE_FIELD)); + } + include_once '../include/forms.php'; + echo $obj->getHtmlErrors(); + $form = profile_getFieldForm($obj); + $form->display(); + break; + + case "delete": + $obj =& $profilefield_handler->get($_REQUEST['id']); + if (!$obj->getVar('field_config')) { + redirect_header('index.php', 2, _AM_PROFILE_FIELDNOTCONFIGURABLE); + } + if (isset($_REQUEST['ok']) && $_REQUEST['ok'] == 1) { + if (!$GLOBALS['xoopsSecurity']->check()) { + redirect_header('field.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors())); + } + if ($profilefield_handler->delete($obj)) { + redirect_header('field.php', 3, sprintf(_AM_PROFILE_DELETEDSUCCESS, _AM_PROFILE_FIELD)); + } else { + echo $obj->getHtmlErrors(); + } + } else { + xoops_confirm(array('ok' => 1,'id' => $_REQUEST['id'],'op' => 'delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_PROFILE_RUSUREDEL, $obj->getVar('field_title'))); + } + break; + + case 'toggle': + if (isset($_REQUEST['field_id'])) { + $field_id = intval($_REQUEST['field_id']); + if (isset($_REQUEST['field_required'])) { + $field_required = intval($_REQUEST['field_required']); + profile_visible_toggle($field_id, $field_required); + } + } + break; +} + +if (isset($template_main)) { + $GLOBALS['xoopsTpl']->display("db:{$template_main}"); +} + +/** + * @param $field_id + * @param $field_required + */ +function profile_visible_toggle($field_id, $field_required) +{ + $field_required = ($field_required == 1) ? 0 : 1; + $this_handler =& xoops_getModuleHandler('field', 'profile'); + $obj = $this_handler->get($field_id); + $obj->setVar('field_required', $field_required); + if ($this_handler->insert($obj, true)) { + redirect_header('field.php', 1, _AM_PROFILE_REQUIRED_TOGGLE_SUCCESS); + } else { + redirect_header('field.php', 1, _AM_PROFILE_REQUIRED_TOGGLE_FAILED); + } +} + +include 'admin_footer.php'; Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/index.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/index.html (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/index.html 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/index.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/index.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/index.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,42 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: index.php 13016 2015-03-15 18:21:22Z timgno $ + */ + +include_once 'admin_header.php'; +xoops_cp_header(); + +$indexAdmin = new ModuleAdmin(); +//----------------------- +// $xpPartnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname')); + +// $totalPartners = $xpPartnerHandler->getCount(); +// $totalNonActivePartners = $xpPartnerHandler->getCount(new Criteria('status', 0, '=')); +// $totalActivePartners = $totalPartners - $totalNonActivePartners; + +// $indexAdmin->addInfoBox(_MA_PROFILE_DASHBOARD); + +// $indexAdmin->addInfoBoxLine(_MA_PROFILE_DASHBOARD, "<infolabel>" ._MA_PROFILE_TOTALACTIVE. "</infolabel>", $totalActivePartners, 'Green'); +// $indexAdmin->addInfoBoxLine(_MA_PROFILE_DASHBOARD, "<infolabel>" ._MA_PROFILE_TOTALNONACTIVE. "</infolabel>", $totalNonActivePartners, 'Red'); +// $indexAdmin->addInfoBoxLine(_MA_PROFILE_DASHBOARD, "<infolabel>" ._MA_PROFILE_TOTALPARTNERS. "</infolabel><infotext>", $totalPartners."</infotext>"); +//---------------------------- + +echo $indexAdmin->addNavigation('index.php'); +echo $indexAdmin->renderIndex(); + +include 'admin_footer.php'; \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/menu.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/menu.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,68 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: menu.php 12363 2014-03-08 10:39:06Z beckmi $ + */ + +defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined"); + +$path = dirname(dirname(dirname(dirname(__FILE__)))); +include_once $path . '/mainfile.php'; + +$dirname = basename(dirname(dirname(__FILE__))); +$module_handler = xoops_gethandler('module'); +$module = $module_handler->getByDirname($dirname); +$pathIcon32 = $module->getInfo('icons32'); +$pathModuleAdmin = $module->getInfo('dirmoduleadmin'); +$pathLanguage = $path . $pathModuleAdmin; + +if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) { + $fileinc = $pathLanguage . '/language/english/main.php'; +} + +include_once $fileinc; + +$adminmenu = array(); + +$i = 1; +$adminmenu[$i]['title'] = _MI_PROFILE_HOME; +$adminmenu[$i]['link'] = "admin/index.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/home.png' ; +$i++; +$adminmenu[$i]['title'] = _MI_PROFILE_USERS; +$adminmenu[$i]['link'] = "admin/user.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/users.png' ; +$i++; +$adminmenu[$i]['title'] = _MI_PROFILE_CATEGORIES; +$adminmenu[$i]['link'] = "admin/category.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/category.png' ; +$i++; +$adminmenu[$i]['title'] = _MI_PROFILE_FIELDS; +$adminmenu[$i]['link'] = "admin/field.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/index.png' ; +$i++; +$adminmenu[$i]['title'] = _MI_PROFILE_STEPS; +$adminmenu[$i]['link'] = "admin/step.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/stats.png' ; +$i++; +$adminmenu[$i]['title'] = _MI_PROFILE_PERMISSIONS; +$adminmenu[$i]['link'] = "admin/permissions.php"; +$adminmenu[$i]['icon'] = $pathIcon32.'/permissions.png' ; +$i++; +$adminmenu[$i]['title'] = _MI_PROFILE_ABOUT; +$adminmenu[$i]['link'] = 'admin/about.php'; +$adminmenu[$i]['icon'] = $pathIcon32.'/about.png'; Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/permissions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/permissions.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/permissions.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,109 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: permissions.php 13016 2015-03-15 18:21:22Z timgno $ + */ +include 'admin_header.php'; +xoops_cp_header(); +$indexAdmin = new ModuleAdmin(); +echo $indexAdmin->addNavigation('permissions.php'); + +$op = isset($_REQUEST['op']) ? $_REQUEST['op'] : "edit"; + +$perm_desc = ""; +switch ($op) { +case "visibility": + //redirect_header("visibility.php", 0, _AM_PROFILE_PROF_VISIBLE); + header("Location: visibility.php"); + break; + +case "edit": + $title_of_form = _AM_PROFILE_PROF_EDITABLE; + $perm_name = "profile_edit"; + $restriction = "field_edit"; + $anonymous = false; + break; + +case "search": + $title_of_form = _AM_PROFILE_PROF_SEARCH; + $perm_name = "profile_search"; + $restriction = ""; + $anonymous = true; + break; + +case "access": + $title_of_form = _AM_PROFILE_PROF_ACCESS; + $perm_name = "profile_access"; + $perm_desc = _AM_PROFILE_PROF_ACCESS_DESC; + $restriction = ""; + $anonymous = true; + break; +} + +include_once $GLOBALS['xoops']->path( "/class/xoopsformloader.php" ); +$opform = new XoopsSimpleForm('', 'opform', 'permissions.php', "get"); +$op_select = new XoopsFormSelect("", 'op', $op); +$op_select->setExtra('onchange="document.forms.opform.submit()"'); +$op_select->addOption('visibility', _AM_PROFILE_PROF_VISIBLE); +$op_select->addOption('edit', _AM_PROFILE_PROF_EDITABLE); +$op_select->addOption('search', _AM_PROFILE_PROF_SEARCH); +$op_select->addOption('access', _AM_PROFILE_PROF_ACCESS); +$opform->addElement($op_select); +$opform->display(); + +$module_id = $GLOBALS['xoopsModule']->getVar('mid'); +include_once $GLOBALS['xoops']->path( '/class/xoopsform/grouppermform.php' ); +$form = new XoopsGroupPermForm($title_of_form, $module_id, $perm_name, $perm_desc, 'admin/permissions.php', $anonymous); + +if ($op == "access") { + $member_handler =& xoops_gethandler('member'); + $glist = $member_handler->getGroupList(); + foreach (array_keys($glist) as $i ) { + if ($i != XOOPS_GROUP_ANONYMOUS) { + $form->addItem($i, $glist[$i]); + } + } + +} else { + $profile_handler =& xoops_getmodulehandler('profile'); + $fields = $profile_handler->loadFields(); + + if ($op != "search") { + foreach (array_keys($fields) as $i ) { + if ( $restriction == "" || $fields[$i]->getVar($restriction) ) { + $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + } + } + } else { + $searchable_types = array('textbox', + 'select', + 'radio', + 'yesno', + 'date', + 'datetime', + 'timezone', + 'language'); + foreach (array_keys($fields) as $i ) { + if ( in_array($fields[$i]->getVar('field_type'), $searchable_types) ) { + $form->addItem($fields[$i]->getVar('field_id'), xoops_substr($fields[$i]->getVar('field_title'), 0, 25) ); + } + } + } +} +$form->display(); +include 'admin_footer.php'; +//xoops_cp_footer(); Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/step.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/step.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/profile/admin/step.php 2015-03-14 18:51:12 UTC (rev 13016) @@ -0,0 +1,114 @@ +<?php +/** + * Extended User Profile + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package profile + * @since 2.3.0 + * @author Jan Pedersen + * @author Taiwen Jiang <ph...@us...> + * @version $Id: step.php 12360 2014-03-08 09:46:59Z beckmi $ + */ +include 'admin_header.php'; +xoops_cp_header(); +$indexAdmin = new ModuleAdmin(); + +$indexAdmin->addItemButton(_ADD . ' ' . _AM_PROFILE_... [truncated message content] |
From: <txm...@us...> - 2015-03-14 11:55:57
|
Revision: 13015 http://sourceforge.net/p/xoops/svn/13015 Author: txmodxoops Date: 2015-03-14 11:55:46 +0000 (Sat, 14 Mar 2015) Log Message: ----------- Added CPanel bootnewage theme for xoops 2.5.8 based on bootstrap alpha version Added variables in class/theme.php Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/xoopsform/formtextdateselect.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/include/functions.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/accordion.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/blue.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/bootstrap-theme.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/bootstrap.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/dark.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/green.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/logger.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/orange.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/red.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/silver.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/style.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/tabs.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/yellow.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/fonts/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/fonts/glyphicons-halflings-regular.eot XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/fonts/glyphicons-halflings-regular.svg XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/fonts/glyphicons-halflings-regular.ttf XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/fonts/glyphicons-halflings-regular.woff XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/fonts/glyphicons-halflings-regular.woff2 XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/fonts/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/avatar.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/avatar_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/banners.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/banners_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/blocks.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/blocks_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/check.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/comments.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/comments_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/configuration.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/configuration_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/edituser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/edituser_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/filemanager.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/filemanager_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/finduser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/finduser_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/groups.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/groups_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/help.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/help_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/icon_options.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/icon_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/images.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/images_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/item.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/mailuser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/mailuser_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/maintenance.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/maintenance_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/modules.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/modules_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/newuser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/prefs.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/prefs_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/smilies.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/smilies_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/tpls.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/tpls_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/userrank.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/userrank_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/icons/waiting.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/img/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/img/accordion.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/img/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/img/logo.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/bootnewage.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/bootstrap.min.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/formenu.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/menu.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/styleswitch.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/tabs.jquery.tools.min.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/js/tooltip.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/bootnewage.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/english/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/english/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/english/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/english/localsupport.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/italian/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/italian/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/italian/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/language/italian/localsupport.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/menu.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/theme.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_accordion.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_footer.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_header.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_metas.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_modules.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_page.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_scripts.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_sidenav.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/xotpl/theme_tabs.html Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php 2015-03-08 21:24:18 UTC (rev 13014) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php 2015-03-14 11:55:46 UTC (rev 13015) @@ -9,14 +9,14 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Kazumi Ono <on...@xo...> * @author Skalpa Keo <sk...@xo...> * @author Taiwen Jiang <ph...@us...> * @package kernel * @subpackage core - * @version $Id: template.php 13009 2015-03-08 16:49:22Z timgno $ + * @version $Id: template.php 12795 2014-09-21 05:41:46Z beckmi $ */ defined('XOOPS_ROOT_PATH') || die('Restricted access'); @@ -32,7 +32,7 @@ * @package kernel * @subpackage core * @author Kazumi Ono <on...@xo...> - * @copyright (c) 2000-2003 The Xoops Project - www.xoops.org + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) */ class XoopsTpl extends Smarty { @@ -55,13 +55,10 @@ $this->debugging = true; } } - $theme_path = $this->template_dir . '/' . $xoopsConfig['theme_set']; $this->Smarty(); $this->setCompileId(); $this->assign(array( - 'xoops_theme_path' => $theme_path, - 'xoops_theme_tpl' => $theme_path .'/xotpl', - 'xoops_url' => XOOPS_URL , + 'xoops_url' => XOOPS_URL , 'xoops_rootpath' => XOOPS_ROOT_PATH , 'xoops_langcode' => _LANGCODE , 'xoops_charset' => _CHARSET , @@ -308,7 +305,7 @@ if ($count > 0) { $xoopsTpl = new XoopsTpl(); $xoopsTpl->caching = 2; - for ($i = 0; $i < $count; $i++) { + for ($i = 0; $i < $count; ++$i) { if ($block_arr[$i]->getVar('template') != '') { $xoopsTpl->clear_cache('db:' . $block_arr[$i]->getVar('template'), 'blk_' . $block_arr[$i]->getVar('bid')); } Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php 2015-03-08 21:24:18 UTC (rev 13014) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/theme.php 2015-03-14 11:55:46 UTC (rev 13015) @@ -9,14 +9,14 @@ * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * - * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @copyright (c) 2000-2014 XOOPS Project (www.xoops.org) * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) * @author Skalpa Keo <sk...@xo...> * @author Taiwen Jiang <ph...@us...> * @since 2.3.0 * @package kernel * @subpackage xos_opal_Theme - * @version $Id: theme.php 12537 2014-05-19 14:19:33Z beckmi $ + * @version $Id: theme.php 12666 2014-06-30 10:02:07Z beckmi $ */ defined('XOOPS_ROOT_PATH') || die('Restricted access'); @@ -280,7 +280,14 @@ 'xoops_dirname' => isset($GLOBALS['xoopsModule'])&& is_object($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar('dirname') : 'system', 'xoops_banner' => ($GLOBALS['xoopsConfig']['banners'] && $this->renderBanner) ? xoops_getbanner() : ' ', 'xoops_pagetitle' => isset($GLOBALS['xoopsModule']) && is_object($GLOBALS['xoopsModule']) ? $GLOBALS['xoopsModule']->getVar('name') : htmlspecialchars($GLOBALS['xoopsConfig']['slogan'], ENT_QUOTES))); - + // From XoopsCore by Timgno + $this->template->assign(array( + 'theme_path' => $this->path, 'theme_tpl' => $this->path . '/xotpl', 'theme_url' => $this->url, + 'theme_img' => $this->url . '/img', 'theme_icons' => $this->url . '/icons', + 'theme_css' => $this->url . '/css', 'theme_js' => $this->url . '/js', + 'theme_lang' => $this->url . '/language', + )); + // -------------------------------------------------------------------- if (isset($GLOBALS['xoopsUser']) && is_object($GLOBALS['xoopsUser'])) { $this->template->assign(array( 'xoops_isuser' => true, Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/xoopsform/formtextdateselect.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/xoopsform/formtextdateselect.php 2015-03-08 21:24:18 UTC (rev 13014) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/xoopsform/formtextdateselect.php 2015-03-14 11:55:46 UTC (rev 13015) @@ -61,7 +61,7 @@ $GLOBALS['xoTheme']->addScript('','', ' $(function() { $.datepicker.setDefaults( $.extend($.datepicker.regional["'. _LANGCODE .'"]) ); - $( "#datepicker-' . ucfirst($ele_name) . '" ).datepicker({ + $( ".datepicker" ).datepicker({ showOn: "button", buttonImage: "'.XOOPS_URL.'/images/calendar.png", buttonImageOnly: true, @@ -76,6 +76,6 @@ '); } } - return "<input type='text' name='" . $ele_name . "' class='form-control' id='datepicker-" . ucfirst($ele_name) . "' size='" . $this->getSize() . "' value=''" . $this->getExtra() . " />"; + return "<input type='text' name='" . $ele_name . "' class='form-control datepicker' size='" . $this->getSize() . "' value=''" . $this->getExtra() . " />"; } } \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/include/functions.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/include/functions.php 2015-03-08 21:24:18 UTC (rev 13014) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/include/functions.php 2015-03-14 11:55:46 UTC (rev 13015) @@ -289,7 +289,7 @@ */ function xoops_error($msg, $title = '') { - echo '<div class="alert alert-danger text-center">'; + echo '<div class="alert alert-danger text-center" role="alert">'; if ($title != '') { echo '<strong>' . $title . '</strong><br /><br />'; } Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/accordion.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/accordion.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/accordion.css 2015-03-14 11:55:46 UTC (rev 13015) @@ -0,0 +1,82 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ + +#accordion { + border:1px solid #f5f5f5; + background-color: #f0f0f0; + color: #333; + width: 100%; + box-shadow: 0 20px 10px -10px rgba(180, 180, 180, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(215, 215, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 215, 215, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(215, 255, 215, 0.3) inset; +} + +/* accordion header */ +#accordion h5 { + padding: 5px 10px; + cursor: pointer; + position: relative; + margin: 1px; + background: url(../../assets/img/accordion.png) repeat-x !important; + color: #ddd; + border: 1px solid #FFF; + font-weight: bold; +} + +/* currently active header */ +#accordion h5.current { + cursor:default; + background-color: #f7f7f7; +} + +/* accordion pane */ +#accordion .pane { + display:none; + padding:10px; + font-size:12px; + line-height: 120%; +} + +.xgiftshop { + text-align: center !important; +} + +#xokeytitle { + padding: 2px; + font-size: 13px; + font-weight: bold; + color: #333; +} + +#xokeynumber { + text-align: center; + padding-top: 5px; + padding-bottom: 5px; + font-size: 13px; + font-weight: bold; + color: #92EF2C; +} + +#xolicenses { + padding: 5px 18px 5px 18px !important; +} + +#xolicenses a{ + color: #45C5DF; +} + +#xolicenses a:hover { + color: #FF0000; + text-decoration: none; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/blue.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/blue.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/blue.css 2015-03-14 11:55:46 UTC (rev 13015) @@ -0,0 +1,161 @@ +/* + * Dashboard Responsive Admin Theme + * + * @copyright Txmod Xoops <http://www.txmodxoops.org/> - Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Txmod Xoops <http://www.txmodxoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id 1.0 +*/ +/* ==================== General definitions ==================== */ + +#top-nav.navbar.navbar-inverse.navbar-static-top { + color:#fff; + background:#5364fc; +} + +#top-nav.navbar.navbar-inverse.navbar-static-top a i { + color:#fff; + background:inherit; +} + +#top-nav.navbar.navbar-inverse.navbar-static-top a:hover i { + color:#e94; + background:#f3f4fc; + text-decoration: none; +} + +#top-nav li img.user-avatar { + margin: -10px 10px -10px 10px; + border-radius: 4px; + width: 40px; + height: 40px; +} + +#top-nav li img.user-avatar a i { + color:#222; + background:inherit; +} + +#top-nav li img.user-avatar a:hover i { + color:#fff; + background:#f3f4fc; + text-decoration: none; +} + +/* Dropdown Submenu Top */ + +.dropdown-submenu{ + position:relative; +} + +.dropdown-submenu>.dropdown-menu { + top:0; + left:100%; + margin-top:-6px; + margin-left:-1px; + -webkit-border-radius:0 6px 6px 6px; + -moz-border-radius:0 6px 6px 6px; + border-radius:0 6px 6px 6px; +} + +.dropdown-submenu:hover>.dropdown-menu { + display: block; +} + +.dropdown-submenu>a.submenu-after:after { + display:block; + content:" "; + float:right; + width:0; + height:0; + border-color:transparent; + border-style:solid; + border-width:5px 0 5px 5px; + border-left-color:#cccccc; + margin-top:5px; + margin-right:-10px; + overflow: auto; +} + +.dropdown-submenu:hover>a.submenu-after:after { + border-left-color:#555; +} + +.dropdown-submenu.pull-left { + float:none; +} + +.dropdown-submenu.pull-left>.dropdown-menu { + left:-100%; + margin-left:10px; + -webkit-border-radius:6px 0 6px 6px; + -moz-border-radius:6px 0 6px 6px; + border-radius:6px 0 6px 6px; +} + +li.bg-color { + margin: 3px; + padding: 2px 0; + -webkit-border-radius:6px 6px 6px 6px; + -moz-border-radius:6px 6px 6px 6px; + border-radius:6px 6px 6px 6px; +} +li.bg-color.bg-dark a { + color:#fff; + background:#3d3636; +} +li.bg-color.bg-silver a { + color:#222; + background:#cccccc; +} +li.bg-color.bg-orange a { + color:#222; + background:#faa90c; +} +li.bg-color.bg-red a { + color:#fff; + background:#ff4d00; +} +li.bg-color.bg-green a { + color:#222; + background:#1eb324; +} +li.bg-color.bg-yellow a { + color:#222; + background:#fae105; +} +li.bg-color.bg-blue a { + color:#fff; + background:#5364fc; +} + +.sidenav { + color:#fff; + background:#5364fc; +} + +.sidenav ul li a { + color:#fff; + background:inherit; +} + +.sidenav ul li a:hover { + color:#e94; + background:#f3f4fc; + text-decoration: none; +} + +.row.row-preferences { + margin: 20px 0 0 10px; +} + +footer { + margin-top:20px; + padding-top:20px; + padding-bottom:20px; + background-color:#efefef; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/bootstrap-theme.min.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/bootstrap-theme.min.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/bootstrap-theme.min.css 2015-03-14 11:55:46 UTC (rev 13015) @@ -0,0 +1,5 @@ +/*! + * Bootstrap v3.3.2 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */.btn-danger,.btn-default,.btn-info,.btn-primary,.btn-success,.btn-warning{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-danger.active,.btn-danger:active,.btn-default.active,.btn-default:active,.btn-info.active,.btn-info:active,.btn-primary.active,.btn-primary:active,.btn-success.active,.btn-success:active,.btn-warning.active,.btn-warning:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-danger .badge,.btn-default .badge,.btn-info .badge,.btn-primary .badge,.btn-success .badge,.btn-warning .badge{text-shadow:none}.btn.active,.btn:active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc}.btn-default:focus,.btn-default:hover{background-color:#e0e0e0;background-position:0 -15px}.btn-default.active,.btn-default:active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default.disabled,.btn-default:disabled,.btn-default[disabled]{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-o-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#265a88));background-image:linear-gradient(to bottom,#337ab7 0,#265a88 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#245580}.btn-primary:focus,.btn-primary:hover{background-color:#265a88;background-position:0 -15px}.btn-primary.active,.btn-primary:active{background-color:#265a88;border-color:#245580}.btn-primary.disabled,.btn-primary:disabled,.btn-primary[disabled]{background-color:#265a88;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:focus,.btn-success:hover{background-color:#419641;background-position:0 -15px}.btn-success.active,.btn-success:active{background-color:#419641;border-color:#3e8f3e}.btn-success.disabled,.btn-success:disabled,.btn-success[disabled]{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:focus,.btn-info:hover{background-color:#2aabd2;background-position:0 -15px}.btn-info.active,.btn-info:active{background-color:#2aabd2;border-color:#28a4c9}.btn-info.disabled,.btn-info:disabled,.btn-info[disabled]{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:focus,.btn-warning:hover{background-color:#eb9316;background-position:0 -15px}.btn-warning.active,.btn-warning:active{background-color:#eb9316;border-color:#e38d13}.btn-warning.disabled,.btn-warning:disabled,.btn-warning[disabled]{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c12e2a));background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:focus,.btn-danger:hover{background-color:#c12e2a;background-position:0 -15px}.btn-danger.active,.btn-danger:active{background-color:#c12e2a;border-color:#b92c28}.btn-danger.disabled,.btn-danger:disabled,.btn-danger[disabled]{background-color:#c12e2a;background-image:none}.img-thumbnail,.thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{background-color:#2e6da4;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-o-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f8f8f8));background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-o-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dbdbdb),to(#e2e2e2));background-image:linear-gradient(to bottom,#dbdbdb 0,#e2e2e2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-o-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#222));background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x}.navbar-inverse .navbar-nav>.active>a,.navbar-inverse .navbar-nav>.open>a{background-image:-webkit-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-o-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#080808),to(#0f0f0f));background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-fixed-bottom,.navbar-fixed-top,.navbar-static-top{border-radius:0}@media (max-width:767px){.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover{color:#fff;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#b9def0));background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#f8efc0));background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-o-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#e7c3c3));background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f5f5f5));background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-o-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#286090));background-image:linear-gradient(to bottom,#337ab7 0,#286090 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#449d44));background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);background-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#31b0d5));background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#ec971f));background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c9302c));background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);background-repeat:repeat-x}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{text-shadow:0 -1px 0 #286090;background-image:-webkit-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2b669a));background-image:linear-gradient(to bottom,#337ab7 0,#2b669a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);background-repeat:repeat-x;border-color:#2b669a}.list-group-item.active .badge,.list-group-item.active:focus .badge,.list-group-item.active:hover .badge{text-shadow:none}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#d0e9c6));background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#c4e3f3));background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#faf2cc));background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-o-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#ebcccc));background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#e8e8e8),to(#f5f5f5));background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/bootstrap.min.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/bootstrap.min.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/bootnewage/assets/css/bootstrap.min.css 2015-03-14 11:55:46 UTC (rev 13015) @@ -0,0 +1,5 @@ +/*! + * Bootstrap v3.3.2 (http://getbootstrap.com) + * Copyright 2011-2015 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) @@ Diff output truncated at 100000 characters. @@ |
From: <txm...@us...> - 2015-03-08 21:24:23
|
Revision: 13014 http://sourceforge.net/p/xoops/svn/13014 Author: txmodxoops Date: 2015-03-08 21:24:18 +0000 (Sun, 08 Mar 2015) Log Message: ----------- Added more jquery ui themes Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/admin.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/button.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/csscolors.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/docs.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/jscolors.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/phpcolors.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/sparqlcolors.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/sqlcolors.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/xmlcolors.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/help.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/imagemanager.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/lightbox.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/menu.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.accordion.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.autocomplete.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.base.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.button.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.core.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.datepicker.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.dialog.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.menu.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.progressbar.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.resizable.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.selectable.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.slider.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.spinner.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.tabs.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/jquery.ui.tooltip.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.accordion.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.autocomplete.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.button.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.core.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.datepicker.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.dialog.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.menu.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.progressbar.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.resizable.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.selectable.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.slider.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.spinner.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.tabs.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.theme.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/jquery.ui.tooltip.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/minified/ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/base/ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-bg_diagonals-thick_90_eeeeee_40x40.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-bg_flat_15_cd0a0a_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-bg_glass_100_e4f1fb_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-bg_glass_50_3baae3_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-bg_glass_80_d7ebf9_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-hard_70_000000_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-soft_100_deedf7_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-bg_highlight-soft_25_ffef8f_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2694e8_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-icons_3d80b3_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-icons_72a7cf_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/cupertino/ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-bg_flat_55_fbec88_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_75_d0e5f5_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_85_dfeffc_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_f5f8f9_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-bg_inset-hard_100_fcfdfd_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-icons_217bc0_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-icons_469bdd_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-icons_6da8d5_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-icons_d8e7f3_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/images/ui-icons_f9bd01_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/redmond/ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-bg_flat_75_ffffff_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_dadada_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-icons_2e83ff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-icons_454545_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-icons_888888_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/jquery-ui.structure.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/jquery-ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/minified/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/minified/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/minified/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/minified/jquery-ui.structure.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/minified/jquery-ui.theme.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/minified/ui.all.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/smoothness/ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-bg_glass_55_fcf0ba_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-bg_gloss-wave_100_ece8da_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_f5f3e5_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_100_fafaf4_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_15_459e00_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-hard_95_cccccc_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-soft_25_67b021_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-bg_highlight-soft_95_ffedad_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-bg_inset-soft_15_2b2922_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-icons_808080_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-icons_847e71_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-icons_8dc262_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-icons_cd0a0a_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-icons_eeeeee_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/south-street/ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-bg_flat_55_999999_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-bg_flat_75_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-bg_glass_45_0078ae_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-bg_glass_55_f8da4e_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-bg_glass_75_79c9ec_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-bg_gloss-wave_45_e14f1c_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-bg_gloss-wave_50_6eac2c_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-bg_gloss-wave_75_2191c0_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-bg_inset-hard_100_fcfdfd_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-icons_0078ae_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-icons_056b93_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-icons_d8e7f3_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-icons_e0fdff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-icons_f5e175_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-icons_f7a50d_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/images/ui-icons_fcd113_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/jquery-ui.structure.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/jquery-ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/minified/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/minified/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/minified/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/minified/jquery-ui.structure.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/minified/jquery-ui.theme.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/minified/ui.all.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/start/ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_diagonals-medium_20_d34d17_40x40.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_flat_30_cccccc_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_flat_50_5c5c5c_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_flat_55_999999_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_flat_75_aaaaaa_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_glass_45_0078ae_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_glass_55_f8da4e_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_glass_75_79c9ec_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_gloss-wave_45_817865_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_gloss-wave_45_e14f1c_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_gloss-wave_50_6eac2c_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_gloss-wave_60_fece2f_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_gloss-wave_70_ffdd57_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_gloss-wave_75_2191c0_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_gloss-wave_90_fff9e5_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_highlight-soft_100_feeebd_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_inset-hard_100_fcfdfd_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-bg_inset-soft_30_ffffff_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_0078ae_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_056b93_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_3d3d3d_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_bd7b00_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_d19405_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_d8e7f3_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_e0fdff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_eb990f_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_ed9f26_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_f5e175_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_f7a50d_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_fadc7a_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_fcd113_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/images/ui-icons_ffe180_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/jquery-ui.structure.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/jquery-ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/minified/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/minified/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/minified/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/minified/jquery-ui.structure.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/minified/jquery-ui.theme.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/minified/ui.all.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/sunny/ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_20_555555_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_4b8e0b_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_a83300_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_cccccc_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/jquery-ui.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-darkness/ui.all.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/animated-overlay.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_222222_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_228ef1_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ef8c08_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ffd27a_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/images/ui-icons_ffffff_256x240.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/jquery-ui.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/jquery.ui.theme.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/ui/ui-lightness/ui.all.css Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/admin.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/admin.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/admin.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,256 @@ +@import url(button.css); +@import url(help.css); + +a {outline:none} + +table {width:100%;} +form {margin:0;padding:0;} + +.xo-imgmini { width:16px; height:16px;} +/* Pagenav */ +.xo-pagenav {height: 20px;} +/* Breadcrumb navigation */ +#xo-breadcrumb { + font: 11px Arial, Helvetica, sans-serif; + background-repeat:repeat-x; + height:30px; + line-height:30px; + color:#9b9b9b; + border:solid 1px #cacaca; + width:100%; + overflow:hidden; + margin:0; + padding:0; +} +#xo-breadcrumb li { + list-style-type:none; + float:left; + padding-left:10px; +} +#xo-breadcrumb a { + height:30px; + display:block; + background-repeat:no-repeat; + background-position:right; + padding-right: 15px; + text-decoration: none; + color:#454545; +} +#xo-breadcrumb a:hover {color:#35acc5;} +#xo-breadcrumb .home { border:none; margin: 8px 0;} +#xo-breadcrumb .xo-help { float:right;} +#xo-breadcrumb .xo-help img { + padding:4px 0; + width:22px; + height:22px; +} +#xo-breadcrumb .xo-help a { + height:30px; + display:block; + background-repeat:no-repeat; + background-position:left; + padding: 0 10px 0 15px; + text-decoration: none; + color:#454545; +} +/* Images & Avatars */ +.xo-thumb { + border-top:1px solid #ccc; + border-left:1px solid #ccc; + border-bottom:1px solid #aaa; + border-right:1px solid #aaa; + position:relative; + width:150px; + height:150px; + margin:10px; + padding:6px; + background-color:#fff; +} +.xo-thumb img { border:0;} +.xo-thumbimg { height: 120px;} +/* Blocks Administration */ +#xo-block-managment td { + vertical-align: top; + padding: 0 5px; + width: 220px; +} +#xo-leftcolumn, #xo-rightcolumn { + vertical-align: top; + width: 200px; + padding: 5px; +} +#xo-centercolumn { + vertical-align: top; + background: #f1f1f1; + margin: 0; +} +/* Block drag class */ +.ui-sortable-placeholder { border: 1px dotted black; visibility: visible !important; height: 50px !important; } +.ui-sortable-placeholder * { visibility: hidden; } +/* Blocs filter */ +.xo-blocksfilter .xo-img { float: left;} +.xo-blocksfilter .xo-caption { float: left; padding: 2px 2px 0 2px;} +.xo-blocksfilter .xo-element { float: left; padding: 1px 10px 0 2px;} +/* Block */ +.xo-block { + margin: 5px; + border: 1px solid #ccc; + background-color: #f9f9f9; +} +.xo-block .xo-blocktitle { + padding: 2px; + margin: 1px; + background: #ccc; + font-weight: bold; + cursor: move; +} +.xo-block .xo-blockaction { padding: 2px; text-align: right;} +.xo-block .xo-blockaction img { + width: 16px; + height: 16px; + padding: 2px; +} +.xo-blocksection { + vertical-align: top; + height: 100px; + background: #fff; + border: 1px dashed #666; +} +.xo-blocksection .xo-title { + font-weight:bold; + padding: 2px; + border-bottom: 1px dashed #666; +} +#xo-tabs {} +.xo-blockhide .xo-block { + margin: 5px; + border: 1px solid #ccc; + background-color: #f9f9f9; + width:180px; + float:left; +} +/* Modules */ +.xo-module-header { padding: 5px;} +ul.xo-log-success li { list-style-image: url('../images/yes.png');} +.xo-module-header h4 { margin: 0; border-bottom: dashed 1px #000;} +#xo-module-log { padding: 5px;} +#xo-module-log h4 { margin: 0; border-bottom: dashed 1px #000;} +#xo-module-log .logger { + padding: 0 .5em; + margin: 5px; + min-height: 200px; + height: 350px; + width: 600px; + overflow: auto; + background-color: #fdfdfd; + border: 1px dashed #666; +} +.xo-moduleinfos li {list-style: none;} +/* Settings */ +.xo-catsetting a { + display: block; + float: left; + height: 110px; + width: 110px; + vertical-align: middle; + text-decoration: none; + padding: 2px; + margin: 3px; +} +.xo-catsetting img { margin: 8px 25px 0; text-align:center;} +.xo-catsetting span { + font-weight: bold; + display: block; + text-align:center; +} +#display_post #xo-logger-output { display:none;} +/* Templates */ +#fileTree #xo-logger-output, #display_contenu #xo-logger-output, +.display_file #xo-logger-output, .edit_file #xo-logger-output, .upload_file #xo-logger-output { display: none;} +.upload_file table.outer { border:none;} +.upload_file table.outer th { display:none;} +.display_folder_left{float: left;margin: 15px 2px 0 5px;} + +.display_folder_right{ + float: left; + margin: 15px 10px 0 5px; + width: 65%; +} +.display_folder { + width: 200px; + height: 400px; + border-top: solid 1px #BBB; + border-left: solid 1px #BBB; + border-bottom: solid 1px #FFF; + border-right: solid 1px #FFF; + background: #FFF; + overflow: scroll; + padding: 3px; +} +.display_file{ margin: 15px 10px 0 5px;} +.display_contenu {width: 400px;} +ul.jqueryFileTree { + font-family: Verdana, sans-serif; + font-size: 11px; + line-height: 18px; + padding: 0; + margin: 0; +} +ul.jqueryFileTree li { + list-style: none; + padding: 0; + padding-left: 20px; + margin: 0; + white-space: nowrap; +} +ul.jqueryFileTree a { + color: #333; + text-decoration: none; + display: block; + padding: 0 2px; +} +ul.jqueryFileTree a:hover {background: #BDF;} +/* Core Styles */ +.expanded { +letter-spacing:0.5em; +} +.jqueryFileTree LI.directory { background: url(../images/mimetypes/folder.png) left top no-repeat; } +.jqueryFileTree LI.expanded { letter-spacing:0; background: url(../images/mimetypes/folder_open.png) left top no-repeat; } +.jqueryFileTree LI.file { background: url(../images/mimetypes/empty.png) left top no-repeat; } +.jqueryFileTree LI.wait { background: url(../images/mimetypes/spinner.gif) left top no-repeat; } +/* File Extensions*/ +.jqueryFileTree LI.ext_css { background: url(../images/mimetypes/css.png) left top no-repeat; } +.jqueryFileTree LI.ext_htm { background: url(../images/mimetypes/html.png) left top no-repeat; } +.jqueryFileTree LI.ext_html { background: url(../images/mimetypes/html.png) left top no-repeat; } + +.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; } +/*==================== tooltip =========================*/ +#tooltip { + position: absolute; + border: 1px solid #A4C3EF; + border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; + background: #D2E2F9; + padding: 10px; + color: #333; + display: none; + box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + -moz-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + -webkit-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + -khtml-box-shadow: 3px 2px 3px rgba(0,0,0,0.5); + opacity: 0.8; + filter: alpha(opacity = 80); + -moz-opacity: 0.8; + -webkit-opacity: 0.8; + -khtml-opacity: 0.8; +} +/* ===== Redirect messages ===== */ +.errorMsg,.confirmMsg, .resultMsg { padding: .8em; text-align:center; margin-bottom: 1em; border: 2px solid #ddd;} +.errorMsg { background-color: #FBE3E4; color: #D12F19; border-color: #FBC2C4; } +.confirmMsg { background-color: #FFF6BF; color: #817134; border-color: #FFD324; } +.resultMsg { background-color: #E6EFC2; color: #529214; border-color: #C6D880; } +.errorMsg a { background-color: transparent; color: #D12F19; } +.confirmMsg a { background-color: transparent; color: #817134; } +.successMsg a { background-color: transparent; color: #529214; } \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/button.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/button.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/button.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,53 @@ +/* Buttons style */ +.xo-buttons a, .xo-buttons button{ + display:block; + float:left; + margin:0 5px 0 0; + background: #e4e4e5 url(../images/bg_button.gif) repeat-x; + border:1px solid #d6d6d6; + border-top:1px solid #dedede; + border-left:1px solid #dedede; + font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif; + font-size:1em; + line-height:1.1em; + text-decoration:none; + font-weight:bold; + color:#454545; + cursor:pointer; + padding:3px 8px 3px 5px; /* Links */ +} +.xo-buttons a:hover, .xo-buttons button:hover { + border:1px solid #ccc; + border-top:1px solid #d6d6d6; + border-left:1px solid #d6d6d6; +} +.xo-buttons button{ + width:auto; + overflow:visible; + padding:3px 8px 4px 5px; /* IE6 */ +} +.xo-buttons button[type]{ + padding:3px 5px 4px 5px; /* Firefox */ + line-height:15px; /* Safari */ +} +*:first-child+html button[type]{ padding:3px 8px 4px 5px; /* IE7 */} +.xo-buttons button img, .xo-buttons a img{ + margin:0 3px -3px 0 !important; + padding:0; + border:none; + width:16px; + height:16px; +} +.xo-actions button img, .xo-actions a img, .xo-actions img { + padding:0 2px; + border:none; + width:16px; + height:16px; + cursor:pointer; +} +.xo-btn-actions { + padding: 2px; + margin: 1px 0; + background: #fff url(../images/bg_button.gif) repeat-x bottom; + border: 1px solid #ccc; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/csscolors.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/csscolors.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/csscolors.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,47 @@ +.editbox { + margin: .4em; + padding: 0; + font-family: monospace; + font-size: 10pt; + color: black; +} + +pre.code, .editbox { + color: #666666; +} + +.editbox p { + margin: 0; +} + +span.css-at { + color: #770088; +} + +span.css-unit { + color: #228811; +} + +span.css-value { + color: #770088; +} + +span.css-identifier { + color: black; +} + +span.css-important { + color: #0000FF; +} + +span.css-colorcode { + color: #004499; +} + +span.css-comment { + color: #AA7700; +} + +span.css-string { + color: #AA2222; +} Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/docs.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/docs.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/docs.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,42 @@ +.underline { + border-bottom: 3px solid #C44; +} + +p.rel { + padding-left: 2em; + text-indent: -2em; +} + +div.border { + border: 1px solid black; + padding: 3px; +} + +code { + font-size: 90%; + color: #144; +} + +pre.code { + margin: 1.1em 12px; + border: 1px solid #CCCCCC; + color: black; + padding: .4em; +} + +.warn { + color: #C00; +} + +.codemirror-iframe { + background: transparent; + color: black; +} + +.CodeMirror-line-numbers { + font-size: 10pt; + margin: 0.4em; + padding-right: 0.4em; + text-align: right; + background: #FAF0E6; +} Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/index.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/index.html (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/index.html 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/jscolors.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/jscolors.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/jscolors.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,55 @@ +.editbox { + margin: .4em; + padding: 0; + font-family: monospace; + font-size: 10pt; + color: black; +} + +pre.code, .editbox { + color: #666666; +} + +.editbox p { + margin: 0; +} + +span.js-punctuation { + color: #666666; +} + +span.js-operator { + color: #666666; +} + +span.js-keyword { + color: #770088; +} + +span.js-atom { + color: #228811; +} + +span.js-variable { + color: black; +} + +span.js-variabledef { + color: #0000FF; +} + +span.js-localvariable { + color: #004499; +} + +span.js-property { + color: black; +} + +span.js-comment { + color: #AA7700; +} + +span.js-string { + color: #AA2222; +} Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/phpcolors.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/phpcolors.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/phpcolors.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,114 @@ +/* +Copyright (c) 2008-2009 Yahoo! Inc. All rights reserved. +The copyrights embodied in the content of this file are licensed by +Yahoo! Inc. under the BSD (revised) open source license + +@author Dan Vlad Dascalescu <da...@ya...> +*/ + +html { + cursor: text; +} + +.editbox { + margin: .4em; + padding: 0; + font-family: monospace; + font-size: 10pt; +} + +/*We should define specific styles for every element of the syntax. + the setting below will cause some annoying color to show through if we missed + defining a style for a token. This is also the "color" of the whitespace and + of the cursor. +*/ +pre.code, .editbox { + color: red; +} + +.editbox p { + margin: 0; +} + +span.php-punctuation { + color: blue; +} + +span.php-keyword { + color: #770088; + font-weight: bold; +} + +span.php-operator { + color: blue; +} + +/* __FILE__ etc.; http://php.net/manual/en/reserved.php */ +span.php-compile-time-constant { + color: #776088; + font-weight: bold; +} + +/* output of get_defined_constants(). Differs from http://php.net/manual/en/reserved.constants.php */ +span.php-predefined-constant { + color: darkgreen; + font-weight: bold; +} + +/* PHP reserved "language constructs"... echo() etc.; http://php.net/manual/en/reserved.php */ +span.php-reserved-language-construct { + color: green; + font-weight: bold; +} + +/* PHP built-in functions: glob(), chr() etc.; output of get_defined_functions()["internal"] */ +span.php-predefined-function { + color: green; +} + +/* PHP predefined classes: PDO, Exception etc.; output of get_declared_classes() and different from http://php.net/manual/en/reserved.classes.php */ +span.php-predefined-class { + color: green; +} + +span.php-atom { + color: #228811; +} + +/* class, interface, namespace or function names, but not $variables */ +span.php-t_string { + color: black; +} + +span.php-variable { + color: black; + font-weight: bold; +} + + +span.js-localvariable { + color: #004499; +} + +span.php-comment { + color: #AA7700; + font-stretch: condensed; +/* font-style: italic; This causes line height to slightly change, getting line numbers out of sync */ +} + +span.php-string-single-quoted { + color: #AA2222; +} +/* double quoted strings allow interpolation */ +span.php-string-double-quoted { + color: #AA2222; + font-weight: bold; +} + +span.syntax-error { + background-color: red; +} + +span.deprecated { + font-size: smaller; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/sparqlcolors.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/sparqlcolors.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/sparqlcolors.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,39 @@ +.editbox { + margin: .4em; + padding: 0; + font-family: monospace; + font-size: 10pt; + color: black; +} + +.editbox p { + margin: 0; +} + +span.sp-keyword { + color: #708; +} + +span.sp-prefixed { + color: #5d1; +} + +span.sp-var { + color: #00c; +} + +span.sp-comment { + color: #a70; +} + +span.sp-literal { + color: #a22; +} + +span.sp-uri { + color: #292; +} + +span.sp-operator { + color: #088; +} Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/sqlcolors.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/sqlcolors.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/sqlcolors.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,53 @@ +.editbox { + margin: .4em; + padding: 0; + font-family: monospace; + font-size: 10pt; + color: black; +} + +.editbox p { + margin: 0; +} + +span.sql-keyword { + color: blue; +} + +span.sql-var { + color: red; +} + +span.sql-comment { + color: #AA7700; +} + +span.sql-literal { + color: green; +} + +span.sql-operator { + color: blue; +} + +span.sql-word { + color: black; +} + +span.sql-function { + color: darkorange; +} + +span.sql-type { + color: purple; +} + +span.sql-separator { + color: #666666; +} + +span.sql-number { + color: darkcyan; +} + + Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/xmlcolors.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/xmlcolors.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/code_mirror/xmlcolors.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,51 @@ +.editbox { + margin: .4em; + padding: 0; + font-family: monospace; + font-size: 10pt; + color: black; +} + +.editbox p { + margin: 0; +} + +span.xml-tagname { + color: #A0B; +} + +span.xml-attribute { + color: #281; +} + +span.xml-punctuation { + color: black; +} + +span.xml-attname { + color: #00F; +} + +span.xml-comment { + color: #A70; +} + +span.xml-cdata { + color: #48A; +} + +span.xml-processing { + color: #999; +} + +span.xml-entity { + color: #A22; +} + +span.xml-error { + color: #F00; +} + +span.xml-text { + color: black; +} Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/help.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/help.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/help.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,46 @@ +/* Help */ +.tips{ + color:#000; + border:1px solid #00cc00; + padding:8px; + margin:15px 10px; +} + +.tips img { + width:22px; + height:22px; +} + +p { + text-align:justify; +} + +.xo-help-menu { + border:1px solid #ccc; + padding: 5px; + margin: 5px auto; + border-radius: 3px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; +} + +#help-template { + width: 98% !important; + border:1px solid #ccc; + padding: 5px; +} + +#help-content { + width: 98% !important; + margin: 0 auto; +} + +#non-modhelp { + padding: 20px; + background-color: #dfdfdf; + border:1px solid #ccc; + font-size: 12px; + font-weight: bold; + +} Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/imagemanager.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/imagemanager.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/imagemanager.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,136 @@ +html {font-size:100.01%;} +body {font-size:75%;} +body { background-color: #f9f9f9; margin: 10px; + font-family: Verdana, Arial, Helvetica, sans-serif;} +#welcomenot { + background-color: #f1f1f1; + margin: 5px; + padding: 5px; + color: #666; + border:1px solid #ccc; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; +} + +table { width: 100%; margin: 1px;} +a:link { color: #3a76d6; font-weight: bold; background-color: transparent;} +a:visited { color: #9eb2d6; font-weight: bold; background-color: transparent;} +a:hover {color: #e18a00; background-color: transparent;} +table td { + background-color: #f9f9f9; + font-size: 12px; + padding: 0; + border-width: 0; + vertical-align: top; +} +#imagenav td {vertical-align: bottom; padding: 10px;} +#addimage a, input { + margin:5px; + background: #e4e4e5 url(../images/bg_button.gif) repeat-x; + border: 1px solid #d6d6d6; + border-top: 1px solid #dedede; + border-left: 1px solid #dedede; + font-size:.9em; + line-height:1.1em; + text-decoration:none; + font-weight:bold; + color:#454545; + cursor:pointer; + padding: 5px !important; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; +} +#addimage a { float: right; display:block;} + +#addimage a:hover { border-top:1px solid #d6d6d6; border-left:1px solid #d6d6d6; color: #000;} +#imagemain td { border: 1px solid #ccc; padding: 5px; vertical-align: middle;} +#imagemain th { + border: 0; + background-image: url(../images/breadcrumb/default/bc_bg.png); + color: #666; + font-size: 11px; + padding: 5px; + vertical-align: top; + text-align:center; + border: 1px solid #ccc; +} +td.body { + padding: 5px; + vertical-align: middle; + border: 1px solid #ccc; + background-color: #f6f6f6; +} +td.caption { + border: 1px solid #ccc; + background-color: #f1f1f1; + color:white; + font-size: 12px; + padding: 5px; + vertical-align: top; + text-align:left; + color: #000; +} +#imageform { border: 1px solid #ccc;} +#header td { + width: 100%; + background-color: #2F5376; + vertical-align: middle; +} +#header #headerbar { border-bottom: 1px solid #ccc; background-color: #ddd;} +#pagenav { text-align:center; margin: 10px;} +#pagenav a { + margin: 2px; + background-color: #D3D2D6; + padding: 4px 8px 4px 8px; + color: #405A80; + font-size: 1em; + font-weight: bold; + border: 1px solid #ccc; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow : 0 20px 10px -10px rgba( 255, 255, 255, 0.3) inset; + -webkit-box-shadow : 0 20px 10px -10px rgba( 255, 255, 255, 0.3) inset; + -khtml-box-shadow : 0 20px 10px -10px rgba( 255, 255, 255, 0.3) inset; + cursor: pointer; +} +#pagenav a:hover { + background-color: #E6EBFF; + padding: 4px 8px 4px 8px; + color: inherit; + cursor: pointer; +} +.xo-pagact { + margin: 2px 5px 2px 5px; + background-color: #E6EBFF; + padding: 4px; + color: #405A80; + font-size: 1em; + font-weight: bold; + border: 1px solid #ccc; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow : 0 20px 10px -10px rgba( 255, 255, 255, 0.3) inset; + -webkit-box-shadow : 0 20px 10px -10px rgba( 255, 255, 255, 0.3) inset; + -khtml-box-shadow : 0 20px 10px -10px rgba( 255, 255, 255, 0.3) inset; + cursor: pointer; +} +.xo-counterpage,.xo-pagarrow { + margin: 0; + padding: 4px; + color: #405A80; + background-color: #D3D2D6; + border: 1px solid #ccc; +} +.xo-counterpage:hover {} +.xo-pagarrow { letter-spacing: 0.2em;} +#footer {text-align:right; padding: 5px;} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/index.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/index.html (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/index.html 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/lightbox.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/lightbox.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/css/lightbox.css 2015-03-08 21:24:18 UTC (rev 13014) @@ -0,0 +1,101 @@ +/** + * jQuery lightBox plugin + * This jQuery plugin was inspired and based on Lightbox 2 by Lokesh Dhakar (http://www.huddletogether.com/projects/lightbox2/) + * and adapted to me for use like a plugin from jQuery. + * @name jquery-lightbox-0.5.css + * @author Leandro Vieira Pinho - http://leandrovieira.com + * @version 0.5 + * @date April 11, 2008 + * @category jQuery plugin + * @copyright (c) 2008 Leandro Vieira Pinho (leandrovieira.com) + * @license CC Attribution-No Derivative Works 2.5 Brazil - http://creativecommons.org/licenses/by-nd/2.5/br/deed.en_US + * @example Visit http://leandrovieira.com/projects/jquery/lightbox/ for more informations about this jQuery plugin + */ +#jquery-overlay { + position: absolute; + top: 0; + left: 0; + z-index: 90; + width: 100%; + height: 500px; +} +#jquery-lightbox { + position: absolute; + top: 0; + left: 0; + width: 100%; + z-index: 100; + text-align: center; + line-height: 0; +} +#jquery-lightbox a img { border: none; } +#lightbox-container-image-box { + position: relative; + background-color: #fff; + width: 250px; + height: 250px; + margin: 0 auto; +} +#lightbox-container-image { padding: 10px; } +#lightbox-loading { + position: absolute; + top: 40%; + left: 0%; + height: 25%; + width: 100%; + text-align: center; + line-height: 0; +} +#lightbox-nav { + position: absolute; + top: 0; + left... [truncated message content] |
From: <txm...@us...> - 2015-03-08 16:03:41
|
Revision: 13013 http://sourceforge.net/p/xoops/svn/13013 Author: txmodxoops Date: 2015-03-08 16:03:38 +0000 (Sun, 08 Mar 2015) Log Message: ----------- Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php 2015-03-08 16:01:58 UTC (rev 13012) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php 2015-03-08 16:03:38 UTC (rev 13013) @@ -16,7 +16,7 @@ * @author Taiwen Jiang <ph...@us...> * @package kernel * @subpackage core - * @version $Id: template.php 12537 2014-05-19 14:19:33Z beckmi $ + * @version $Id: template.php 13009 2015-03-08 16:49:22Z timgno $ */ defined('XOOPS_ROOT_PATH') || die('Restricted access'); |
From: <txm...@us...> - 2015-03-08 16:02:00
|
Revision: 13012 http://sourceforge.net/p/xoops/svn/13012 Author: txmodxoops Date: 2015-03-08 16:01:58 +0000 (Sun, 08 Mar 2015) Log Message: ----------- Added string path of theme Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/template.php 2015-03-08 16:01:58 UTC (rev 13012) @@ -0,0 +1,317 @@ +<?php +/** + * XOOPS template engine class + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @author Kazumi Ono <on...@xo...> + * @author Skalpa Keo <sk...@xo...> + * @author Taiwen Jiang <ph...@us...> + * @package kernel + * @subpackage core + * @version $Id: template.php 12537 2014-05-19 14:19:33Z beckmi $ + */ + +defined('XOOPS_ROOT_PATH') || die('Restricted access'); +/** + * Base class: Smarty template engine + */ +define('SMARTY_DIR', XOOPS_ROOT_PATH . '/class/smarty/'); +require_once SMARTY_DIR . 'Smarty.class.php'; + +/** + * Template engine + * + * @package kernel + * @subpackage core + * @author Kazumi Ono <on...@xo...> + * @copyright (c) 2000-2003 The Xoops Project - www.xoops.org + */ +class XoopsTpl extends Smarty +{ + function XoopsTpl() + { + global $xoopsConfig; + + $this->left_delimiter = '<{'; + $this->right_delimiter = '}>'; + $this->template_dir = XOOPS_THEME_PATH; + $this->cache_dir = XOOPS_VAR_PATH . '/caches/smarty_cache'; + $this->compile_dir = XOOPS_VAR_PATH . '/caches/smarty_compile'; + $this->compile_check = ($xoopsConfig['theme_fromfile'] == 1); + $this->plugins_dir = array( + XOOPS_ROOT_PATH . '/class/smarty/xoops_plugins' , + XOOPS_ROOT_PATH . '/class/smarty/plugins'); + if ($xoopsConfig['debug_mode']) { + $this->debugging_ctrl = 'URL'; + if ($xoopsConfig['debug_mode'] == 3) { + $this->debugging = true; + } + } + $theme_path = $this->template_dir . '/' . $xoopsConfig['theme_set']; + $this->Smarty(); + $this->setCompileId(); + $this->assign(array( + 'xoops_theme_path' => $theme_path, + 'xoops_theme_tpl' => $theme_path .'/xotpl', + 'xoops_url' => XOOPS_URL , + 'xoops_rootpath' => XOOPS_ROOT_PATH , + 'xoops_langcode' => _LANGCODE , + 'xoops_charset' => _CHARSET , + 'xoops_version' => XOOPS_VERSION , + 'xoops_upload_url' => XOOPS_UPLOAD_URL)); + } + + /** + * Renders output from template data + * + * @param string $tplSource The template to render + * @param bool $display If rendered text should be output or returned + * @param null $vars + * + * @return string Rendered output if $display was false + */ + function fetchFromData($tplSource, $display = false, $vars = null) + { + if (!function_exists('smarty_function_eval')) { + require_once SMARTY_DIR . '/plugins/function.eval.php'; + } + if (isset($vars)) { + $oldVars = $this->_tpl_vars; + $this->assign($vars); + $out = smarty_function_eval(array( + 'var' => $tplSource), $this); + $this->_tpl_vars = $oldVars; + + return $out; + } + + return smarty_function_eval(array( + 'var' => $tplSource), $this); + } + + /** + * XoopsTpl::touch + * + * @param mixed $resourceName + * @return bool + */ + function touch($resourceName) + { + $isForced = $this->force_compile; + $this->force_compile = true; + $this->clear_cache($resourceName); + $result = $this->_compile_resource($resourceName, $this->_get_compile_path($resourceName)); + $this->force_compile = $isForced; + + return $result; + } + + /** + * returns an auto_id for auto-file-functions + * + * @param string $cache_id + * @param string $compile_id + * @return string |null + */ + function _get_auto_id($cache_id = null, $compile_id = null) + { + if (isset($cache_id)) { + return (isset($compile_id)) ? $compile_id . '-' . $cache_id : $cache_id; + } else if (isset($compile_id)) { + return $compile_id; + } else { + return null; + } + } + + /** + * XoopsTpl::setCompileId() + * + * @param mixed $module_dirname + * @param mixed $theme_set + * @param mixed $template_set + * @return void + */ + function setCompileId($module_dirname = null, $theme_set = null, $template_set = null) + { + global $xoopsConfig; + + $template_set = empty($template_set) ? $xoopsConfig['template_set'] : $template_set; + $theme_set = empty($theme_set) ? $xoopsConfig['theme_set'] : $theme_set; + $module_dirname = empty($module_dirname) ? (empty($GLOBALS['xoopsModule']) ? 'system' : $GLOBALS['xoopsModule']->getVar('dirname', 'n')) : $module_dirname; + $this->compile_id = substr(md5(XOOPS_URL), 0, 8) . '-' . $module_dirname . '-' . $theme_set . '-' . $template_set; + $this->_compile_id = $this->compile_id; + } + + /** + * XoopsTpl::clearCache() + * + * @param mixed $module_dirname + * @param mixed $theme_set + * @param mixed $template_set + * @return bool + */ + function clearCache($module_dirname = null, $theme_set = null, $template_set = null) + { + $compile_id = $this->compile_id; + $this->setCompileId($module_dirname, $template_set, $theme_set); + $_params = array( + 'auto_base' => $this->cache_dir , + 'auto_source' => null , + 'auto_id' => $this->compile_id, + 'exp_time' => null, + ); + $this->_compile_id = $this->compile_id = $compile_id; + require_once SMARTY_CORE_DIR . 'core.rm_auto.php'; + + return smarty_core_rm_auto($_params, $this); + } + + /** + * + * @deprecated DO NOT USE THESE METHODS, ACCESS THE CORRESPONDING PROPERTIES INSTEAD + */ + function xoops_setTemplateDir($dirname) + { + $GLOBALS['xoopsLogger']->addDeprecated('\'$xoopsTpl->xoops_setTemplateDir($value)\' is deprecated since XOOPS 2.5.4, please use \'$xoopsTpl->template_dir=$value;\' instead.'); + + $this->template_dir = $dirname; + } + + /** + * @return string + */ + function xoops_getTemplateDir() + { + $GLOBALS['xoopsLogger']->addDeprecated('\'$xoopsTpl->xoops_getTemplateDir()\' is deprecated since XOOPS 2.5.4, please use \'$xoopsTpl->template_dir;\' instead.'); + + return $this->template_dir; + } + + /** + * @param bool $flag + */ + function xoops_setDebugging($flag = false) + { + $GLOBALS['xoopsLogger']->addDeprecated('\'$xoopsTpl->xoops_setDebugging($value)\' is deprecated since XOOPS 2.5.4, please use \'$xoopsTpl->debugging=$value;\' instead.'); + + $this->debugging = is_bool($flag) ? $flag : false; + } + + /** + * @param int $num + */ + function xoops_setCaching($num = 0) + { + $GLOBALS['xoopsLogger']->addDeprecated('\'$xoopsTpl->xoops_setCaching($value)\' is deprecated since XOOPS 2.5.4, please use \'$xoopsTpl->caching=$value;\' instead.'); + + $this->caching = (int) $num; + } + + /** + * @param $dirname + */ + function xoops_setCompileDir($dirname) + { + $GLOBALS['xoopsLogger']->addDeprecated('\'$xoopsTpl->xoops_setCompileDir($value)\' is deprecated since XOOPS 2.5.4, please use \'$xoopsTpl->compile_dir=$value;\' instead.'); + + $this->compile_dir = $dirname; + } + + /** + * @param $dirname + */ + function xoops_setCacheDir($dirname) + { + $GLOBALS['xoopsLogger']->addDeprecated('\'$xoopsTpl->xoops_setCacheDir($value)\' is deprecated since XOOPS 2.5.4, please use \'$xoopsTpl->cache_dir=$value;\' instead.'); + + $this->cache_dir = $dirname; + } + + /** + * @return bool + */ + function xoops_canUpdateFromFile() + { + $GLOBALS['xoopsLogger']->addDeprecated('\'$xoopsTpl->xoops_canUpdateFromFile()\' is deprecated since XOOPS 2.5.4, please use \'$xoopsTpl->compile_check;\' instead.'); + + return $this->compile_check; + } + + /** + * @param $data + * + * @return string + */ + function xoops_fetchFromData($data) + { + $GLOBALS['xoopsLogger']->addDeprecated('\'$xoopsTpl->xoops_fetchFromData($value)\' is deprecated since XOOPS 2.5.4, please use \'$xoopsTpl->fetchFromData($value);\' instead.'); + + return $this->fetchFromData($data); + } + + /** + * @param int $num + */ + function xoops_setCacheTime($num = 0) + { + $GLOBALS['xoopsLogger']->addDeprecated('\'$xoopsTpl->xoops_setCacheTime($value)\' is deprecated since XOOPS 2.5.4, please use \'$xoopsTpl->cache_lifetime=$value;\' instead.'); + + if (($num = (int) $num) <= 0) { + $this->caching = 0; + } else { + $this->cache_lifetime = $num; + } + } +} + +/** + * function to update compiled template file in templates_c folder + * + * @param string $tpl_id + * @param boolean $clear_old + * @return boolean + */ +function xoops_template_touch($tpl_id, $clear_old = true) +{ + $tplfile_handler = &xoops_gethandler('tplfile'); + $tplfile =& $tplfile_handler->get($tpl_id); + + if (is_object($tplfile)) { + $file = $tplfile->getVar('tpl_file', 'n'); + $tpl = new XoopsTpl(); + + return $tpl->touch('db:' . $file); + } + + return false; +} + +/** + * Clear the module cache + * + * @param int $mid Module ID + * @return void + */ +function xoops_template_clear_module_cache($mid) +{ + $block_arr = XoopsBlock::getByModule($mid); + $count = count($block_arr); + if ($count > 0) { + $xoopsTpl = new XoopsTpl(); + $xoopsTpl->caching = 2; + for ($i = 0; $i < $count; $i++) { + if ($block_arr[$i]->getVar('template') != '') { + $xoopsTpl->clear_cache('db:' . $block_arr[$i]->getVar('template'), 'blk_' . $block_arr[$i]->getVar('bid')); + } + } + } +} |
From: <txm...@us...> - 2015-03-08 14:32:59
|
Revision: 13011 http://sourceforge.net/p/xoops/svn/13011 Author: txmodxoops Date: 2015-03-08 14:32:56 +0000 (Sun, 08 Mar 2015) Log Message: ----------- Updated Fixed bugs Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/plugins/function.breadcrumbs.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/dashboard.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/theme.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_header.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_footer.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/xotpl/header.html Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/constants.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/menu.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/logger.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_sidenav.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/assets/js/holder/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/assets/js/holder/holder.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/assets/js/holder/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/xoops_version.php Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/plugins/function.breadcrumbs.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/plugins/function.breadcrumbs.php 2015-03-07 16:47:59 UTC (rev 13010) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/plugins/function.breadcrumbs.php 2015-03-08 14:32:56 UTC (rev 13011) @@ -24,8 +24,9 @@ * * @version 1.0 * @author Txmod Xoops - <txmodxoops at gmail dot org | www.txmodxoops.org> -* @param array -* @param Smarty +* +* @param params +* @param smarty * @return string */ Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/admin.php 2015-03-08 14:32:56 UTC (rev 13011) @@ -0,0 +1,194 @@ +<?php +/** + * System constants file + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @version $Id: admin.php 12033 2013-09-14 03:16:44Z beckmi $ + * @revision $Id: admin.php 13008 2015-03-08 13:42:22Z timgno $ + */ + +// Include header +include 'header.php'; + +if ( isset($fct) && $fct == 'users' ) { + $xoopsOption['pagetype'] = 'user'; +} + +$error = false; +if ($admintest != 0) { + if (isset($fct) && $fct != '') { + $fct = preg_replace("/[^a-z0-9_\-]/i", "", $fct); + if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/' . $fct . '/xoops_version.php' ) ) { + // Load language file + system_loadLanguage( $fct, $xoopsModule->getVar( 'dirname', 'n' ) ); + // Include Configuration file + require XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/' . $fct . '/xoops_version.php'; + // Get System permission handler + $sysperm_handler =& xoops_gethandler('groupperm'); + + $category = !empty($modversion['category']) ? intval($modversion['category']) : 0; + unset($modversion); + + if ($category > 0) { + $group = $xoopsUser->getGroups(); + if ( in_array( XOOPS_GROUP_ADMIN, $group) || false != $sysperm_handler->checkRight( 'system_admin', $category, $group, $xoopsModule->getVar('mid') ) ) { + if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/' . $fct . '/main.php' ) ) { + include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/' . $fct . '/main.php'; + } else { + $error = true; + } + } else { + $error = true; + } + } elseif ($fct == 'version') { + if ( file_exists( XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/version/main.php' ) ) { + include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar( 'dirname', 'n' ) . '/admin/version/main.php'; + } else { + $error = true; + } + } else { + $error = true; + } + } else { + $error = true; + } + } else { + $error = true; + } +} + +if (false != $error) { + + $op = system_CleanVars ( $_REQUEST, 'op', '', 'string' ); + if ( $op == 'system_activate') { + $part = system_CleanVars ( $_REQUEST, 'type', '', 'string' ); + $config_handler = xoops_gethandler('config'); + + $criteria = new Criteria('conf_name', 'active_' . $part); + $configs = $config_handler->getConfigs( $criteria ); + foreach ($configs as $conf) { + if ( $conf->getVar('conf_name') == 'active_' . $part) { + $conf->setVar('conf_value', !$conf->getVar('conf_value') ); + $config_handler->insertConfig($conf); + } + } + exit; + } + // Define main template + $xoopsOption['template_main'] = 'system_index.html'; + xoops_cp_header(); + // Define Stylesheet + $xoTheme->addStylesheet( XOOPS_URL . '/modules/system/css/admin.css' ); + // ======== Append libraries directly on footer templates of the admin theme ============ + // Define scripts + //$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js'); + //$xoTheme->addScript('modules/system/js/admin.js'); + // ======== ================================================================ ============ + // Define Breadcrumb and tips + $xoBreadCrumb->addLink( _AM_SYSTEM_CONFIG ); + $xoBreadCrumb->addTips( _AM_SYSTEM_TIPS_MAIN ); + $xoBreadCrumb->render(); + $groups = $xoopsUser->getGroups(); + $all_ok = false; + if (!in_array(XOOPS_GROUP_ADMIN, $groups)) { + $sysperm_handler =& xoops_gethandler('groupperm'); + $ok_syscats = $sysperm_handler->getItemIds('system_admin', $groups); + } else { + $all_ok = true; + } + + xoops_load('xoopslists'); + + $admin_dir = XOOPS_ROOT_PATH . '/modules/system/admin'; + $dirlist = XoopsLists::getDirListAsArray($admin_dir); + $inactive_section = array( 'blocksadmin', 'groups', 'modulesadmin', 'preferences', 'tplsets'); + foreach($dirlist as $directory) { + if ( file_exists( $admin_dir . '/' . $directory . '/xoops_version.php' ) ) { + + require $admin_dir . '/' . $directory . '/xoops_version.php'; + + if ($modversion['hasAdmin']) { + + if ( xoops_getModuleOption('active_' . $directory) ) { + $category = isset($modversion['category']) ? intval($modversion['category']) : 0; + if ( false != $all_ok || in_array($modversion['category'], $ok_syscats)) { + $menu['file'] = $directory; + $menu['title'] = trim($modversion['name']); + $menu['desc'] = str_replace('<br />', ' ', $modversion['description']); + $menu['icon'] = $modversion['image']; + $menu['status'] = true; + } + } else { + $category = isset($modversion['category']) ? intval($modversion['category']) : 0; + if ( false != $all_ok || in_array($modversion['category'], $ok_syscats)) { + $menu['file'] = $directory; + $menu['title'] = trim($modversion['name']); + $menu['desc'] = str_replace('<br />', ' ', $modversion['description']); + $menu['icon'] = $modversion['image']; + $menu['status'] = false; + } + } + if (!in_array($directory, $inactive_section)) { + $menu['used'] = true; + } + if ( false != $all_ok || in_array($modversion['category'], $ok_syscats)) { + switch ( $directory ) { + case 'avatars': + $avatar_handler = xoops_getHandler('avatar'); + $avatar = $avatar_handler->getCount(); + $menu['infos'] = sprintf(_AM_SYSTEM_AVATAR_INFO, $avatar); + break; + case 'banners': + $banner_handler =& xoops_getModuleHandler( 'banner', 'system' ); + $banner = $banner_handler->getCount(); + $menu['infos'] = sprintf(_AM_SYSTEM_BANNER_INFO, $banner); + break; + case 'comments': + $comment_handler =& xoops_gethandler('comment'); + $comment = $comment_handler->getCount(); + $menu['infos'] = sprintf(_AM_SYSTEM_COMMENT_INFO, $comment); + break; + case 'groups': + $groups_Handler =& xoops_getModuleHandler( 'group', 'system' ); + $groups = $groups_Handler->getCount(); + $menu['infos'] = sprintf(_AM_SYSTEM_GROUP_INFO, $groups); + break; + case 'images': + $imgcat_handler = xoops_gethandler('image'); + $img = $imgcat_handler->getCount(); + $menu['infos'] = sprintf(_AM_SYSTEM_IMG_INFO, $img); + break; + case 'smilies': + $smilies_Handler =& xoops_getModuleHandler( 'smilies', 'system' ); + $smilies = $smilies_Handler->getCount(); + $menu['infos'] = sprintf(_AM_SYSTEM_SMILIES_INFO, $smilies); + break; + case 'userrank': + $userrank_Handler =& xoops_getModuleHandler( 'userrank', 'system' ); + $userrank = $userrank_Handler->getCount(); + $menu['infos'] = sprintf(_AM_SYSTEM_RANKS_INFO, $userrank); + break; + case 'users': + $member_handler =& xoops_getModuleHandler('users', 'system'); + $member = $member_handler->getCount(); + $menu['infos'] = sprintf(_AM_SYSTEM_USERS_INFO, $member); + break; + } + } + $xoopsTpl->append_by_ref( 'menu', $menu ); + unset( $menu ); + } + unset($modversion); + } + } + unset($dirlist); + xoops_cp_footer(); +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/constants.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/constants.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/constants.php 2015-03-08 14:32:56 UTC (rev 13011) @@ -0,0 +1,41 @@ +<?php +/** + * System constants file + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @version $Id: constants.php 12033 2013-09-14 03:16:44Z beckmi $ + * @revision $Id: constants.php 13008 2015-03-08 13:41:30Z timgno $ + */ + +define('XOOPS_SYSTEM_GROUP', 1); +define('XOOPS_SYSTEM_USER', 2); +define('XOOPS_SYSTEM_PREF', 3); +define('XOOPS_SYSTEM_MODULE', 4); +define('XOOPS_SYSTEM_BLOCK', 5); +define('XOOPS_SYSTEM_FINDU', 7); +define('XOOPS_SYSTEM_MAILU', 8); +define('XOOPS_SYSTEM_IMAGE', 9); +define('XOOPS_SYSTEM_AVATAR', 10); +define('XOOPS_SYSTEM_URANK', 11); +define('XOOPS_SYSTEM_SMILE', 12); +define('XOOPS_SYSTEM_BANNER', 13); +define('XOOPS_SYSTEM_COMMENT', 14); +define('XOOPS_SYSTEM_TPLSET', 15); +define('XOOPS_SYSTEM_FILEMANAGER', 16); +define('XOOPS_SYSTEM_MAINTENANCE', 17); +// Configuration Category +define('SYSTEM_CAT_MAIN', 0 ); +define('SYSTEM_CAT_USER', 1 ); +define('SYSTEM_CAT_META', 2 ); +define('SYSTEM_CAT_WORD', 3 ); +define('SYSTEM_CAT_SEARCH', 4 ); +define('SYSTEM_CAT_MAIL', 5 ); +define('SYSTEM_CAT_AUTH', 6 ); \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/menu.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/menu.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/menu.php 2015-03-08 14:32:56 UTC (rev 13011) @@ -0,0 +1,52 @@ +<?php +/** + * System menu file + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @version $Id: menu.php 12036 2013-09-14 04:58:55Z beckmi $ + * @revision $Id: menu.php 13008 2015-03-08 13:55:25Z timgno $ + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +$groups = $GLOBALS['xoopsUser']->getGroups(); +$all_ok = false; +if (!in_array(XOOPS_GROUP_ADMIN, $groups)) { + $sysperm_handler =& xoops_gethandler('groupperm'); + $ok_syscats = $sysperm_handler->getItemIds('system_admin', $groups); +} else { + $all_ok = true; +} +require_once $GLOBALS['xoops']->path( '/class/xoopslists.php' ); +// include system category definitions +include_once $GLOBALS['xoops']->path( '/modules/system/constants.php' ); + +$admin_dir = $GLOBALS['xoops']->path( '/modules/system/admin' ); +$dirlist = XoopsLists::getDirListAsArray( $admin_dir ); +$index = 0; +foreach ($dirlist as $file) { + if ( file_exists( $admin_dir . '/' . $file . '/xoops_version.php' ) ) { + include $admin_dir . '/' . $file . '/xoops_version.php'; + if ($modversion['hasAdmin']) { + if ( xoops_getModuleOption( 'active_' . $file, 'system' ) ) { + $category = isset( $modversion['category'] ) ? intval( $modversion['category'] ) : 0; + if ( false != $all_ok || in_array( $modversion['category'], $ok_syscats ) ) { + $adminmenu[$index]['title'] = trim( $modversion['name'] ); + $adminmenu[$index]['link'] = 'admin.php?fct=' . $file; + $adminmenu[$index]['image'] = $modversion['image']; + } + } + } + unset($modversion); + } + $index++; +} +unset($dirlist); \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/dashboard.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/dashboard.css 2015-03-07 16:47:59 UTC (rev 13010) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/dashboard.css 2015-03-08 14:32:56 UTC (rev 13011) @@ -1,17 +1,21 @@ +/* + * Dashboard Responsive Admin Theme + * + * @copyright Txmod Xoops <http://www.txmodxoops.org/> - Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Txmod Xoops <http://www.txmodxoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id 1.0 +*/ +/* ==================== Import others style cheats ==================== */ +@import url(logger.css); -/*============================================================= - Authour URI: www.binarycart.com - License: Commons Attribution 3.0 +/* ==================== General definitions ==================== */ +html { } - http://creativecommons.org/licenses/by/3.0/ - - 100% To use For Personal And Commercial Use. - IN EXCHANGE JUST GIVE US CREDITS AND TELL YOUR FRIENDS ABOUT US - - ======================================================== */ -/*============================================== - GENERAL STYLES - =============================================*/ body { font-family: 'Open Sans', sans-serif; } @@ -23,11 +27,11 @@ #page-wrapper { padding: 10px 10px; - min-height: 400px; + min-height: 380px; z-index: 1; box-shadow: 0 0 3px #131313; - padding-bottom: 80px !important; - margin-bottom: -78px !important; + padding-bottom: 70px !important; + margin-bottom: -68px !important; overflow: hidden; -webkit-transition: 0.2s; -moz-transition: 0.2s; @@ -42,7 +46,7 @@ margin:2px 7px 2px 0px; background-color:#fff!important; padding:8px; - min-height:800px; + min-height:780px; } #logout { Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/logger.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/logger.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/logger.css 2015-03-08 14:32:56 UTC (rev 13011) @@ -0,0 +1,43 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ +#xo-logger-errors, #xo-logger-deprecated, #xo-logger-queries, #xo-logger-blocks, +#xo-logger-extra, #xo-logger-timers{ + max-width: 95% !important; +} +#xo-logger-output { + margin: 0 auto !important; + background-color: #f0f0f0; +} +#xo-logger-tabs { + background-color: #8E8C8C; + padding-top: 8px; + padding-bottom: 8px; + margin-top: -2px; + padding-left: 2%; + padding-right: 2%; + width: 100% !important; +} +#xo-logger-tabs a { + color: #00008C; + background-color: #FEFCFC; +} +#xo-logger-tabs a:hover { + color: #f0f08C; + background-color: inherit; +} +#xo-logger-errors {} +#xo-logger-deprecated {} +#xo-logger-queries {} +#xo-logger-blocks {} +#xo-logger-extra {} +#xo-logger-timers {} \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/theme.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/theme.html 2015-03-07 16:47:59 UTC (rev 13010) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/theme.html 2015-03-08 14:32:56 UTC (rev 13011) @@ -6,6 +6,7 @@ <body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>"> <div id="wrapper"> <{includeq file="$theme_tpl/theme_header.html"}> + <{includeq file="$theme_tpl/theme_sidenav.html"}> <{includeq file="$theme_tpl/theme_page.html" }> <{includeq file="$theme_tpl/theme_footer.html"}> </div><{* /#wrapper *}> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_header.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_header.html 2015-03-07 16:47:59 UTC (rev 13010) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_header.html 2015-03-08 14:32:56 UTC (rev 13011) @@ -31,21 +31,12 @@ </ul> </li> <{/foreach}> - </ul> + </ul> <div id="logout"> + <{* Date Time Now *}> + <{$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}> <a href="<{xoAppUrl /}>" class="btn btn-success square-btn-adjust"><i class="fa fa-home fa-sm"></i> <{$smarty.const._YOURHOME}></a> <a href="<{xoAppUrl user.php?op=logout}>" class="btn btn-danger square-btn-adjust"><i class="fa fa-power-off fa-sm"></i> <{$smarty.const._LOGOUT}></a> </div> </div> - </nav> - <!-- /. NAV TOP --> - <nav class="navbar-default navbar-side" role="navigation"> - <div class="sidebar-collapse"> - <ul class="nav" id="main-menu"> - <li> - <a class="active-menu" href="<{xoAppUrl admin.php}>"><i class="fa fa-dashboard fa-2x"></i> Dashboard</a> - </li> - </ul> - </div> - </nav> - <!-- /. NAV SIDE --> \ No newline at end of file + </nav><!-- /. NAV TOP --> \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_sidenav.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_sidenav.html (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_sidenav.html 2015-03-08 14:32:56 UTC (rev 13011) @@ -0,0 +1,10 @@ + <nav class="navbar-default navbar-side" role="navigation"> + <div class="sidebar-collapse"> + <ul class="nav" id="main-menu"> + <li> + <a class="active-menu" href="<{xoAppUrl admin.php}>"><i class="fa fa-dashboard fa-2x"></i> Dashboard</a> + </li> + </ul> + </div> + </nav> + <!-- /. NAV SIDE --> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_footer.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_footer.html 2015-03-07 16:47:59 UTC (rev 13010) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_footer.html 2015-03-08 14:32:56 UTC (rev 13011) @@ -1,5 +1,5 @@ <div id='xo-footer'> <div id="xo-footer-body">Powered by <a class="tooltip" rel="external" href="http://sourceforge.net/projects/xoops/" title="Xoops Project"><{$xoops_version}></a> © 2001-<{$smarty.now|date_format:"%Y"}></div> - <div id="xo-footer-rss" ><a class="tooltip" rel="external" href="<{xoAppUrl backend.php}>" title="<{$smarty.const._OXYGEN_RSS}>"><img src="<{xoImgUrl img/feed.png}>" /></a></div> + <div id="xo-footer-rss" ><a class="tooltip" rel="external" href="<{xoAppUrl backend.php}>" title="<{$smarty.const._OXYGEN_RSS}>"><img src="<{xoImgUrl assets/img/feed.png}>" /></a></div> <div><{includeq file="$theme_tpl/xo_uptop.html"}></div> </div> \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/assets/js/holder/holder.js =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/assets/js/holder/holder.js (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/assets/js/holder/holder.js 2015-03-08 14:32:56 UTC (rev 13011) @@ -0,0 +1,401 @@ +/* + +Holder - 1.9 - client side image placeholders +(c) 2012-2013 Ivan Malopinsky / http://imsky.co + +Provided under the Apache 2.0 License: http://www.apache.org/licenses/LICENSE-2.0 +Commercial use requires attribution. + +*/ + +var Holder = Holder || {}; +(function (app, win) { + +var preempted = false, +fallback = false, +canvas = document.createElement('canvas'); + +//getElementsByClassName polyfill +document.getElementsByClassName||(document.getElementsByClassName=function(e){var t=document,n,r,i,s=[];if(t.querySelectorAll)return t.querySelectorAll("."+e);if(t.evaluate){r=".//*[contains(concat(' ', @class, ' '), ' "+e+" ')]",n=t.evaluate(r,t,null,0,null);while(i=n.iterateNext())s.push(i)}else{n=t.getElementsByTagName("*"),r=new RegExp("(^|\\s)"+e+"(\\s|$)");for(i=0;i<n.length;i++)r.test(n[i].className)&&s.push(n[i])}return s}) + +//getComputedStyle polyfill +window.getComputedStyle||(window.getComputedStyle=function(e,t){return this.el=e,this.getPropertyValue=function(t){var n=/(\-([a-z]){1})/g;return t=="float"&&(t="styleFloat"),n.test(t)&&(t=t.replace(n,function(){return arguments[2].toUpperCase()})),e.currentStyle[t]?e.currentStyle[t]:null},this}) + +//http://javascript.nwbox.com/ContentLoaded by Diego Perini with modifications +function contentLoaded(n,t){var l="complete",s="readystatechange",u=!1,h=u,c=!0,i=n.document,a=i.documentElement,e=i.addEventListener?"addEventListener":"attachEvent",v=i.addEventListener?"removeEventListener":"detachEvent",f=i.addEventListener?"":"on",r=function(e){(e.type!=s||i.readyState==l)&&((e.type=="load"?n:i)[v](f+e.type,r,u),!h&&(h=!0)&&t.call(n,null))},o=function(){try{a.doScroll("left")}catch(n){setTimeout(o,50);return}r("poll")};if(i.readyState==l)t.call(n,"lazy");else{if(i.createEventObject&&a.doScroll){try{c=!n.frameElement}catch(y){}c&&o()}i[e](f+"DOMContentLoaded",r,u),i[e](f+s,r,u),n[e](f+"load",r,u)}}; + +//https://gist.github.com/991057 by Jed Schmidt with modifications +function selector(a){ + a=a.match(/^(\W)?(.*)/);var b=document["getElement"+(a[1]?a[1]=="#"?"ById":"sByClassName":"sByTagName")](a[2]); + var ret=[]; b!=null&&(b.length?ret=b:b.length==0?ret=b:ret=[b]); return ret; +} + +//shallow object property extend +function extend(a,b){var c={};for(var d in a)c[d]=a[d];for(var e in b)c[e]=b[e];return c} + +//hasOwnProperty polyfill +if (!Object.prototype.hasOwnProperty) + Object.prototype.hasOwnProperty = function(prop) { + var proto = this.__proto__ || this.constructor.prototype; + return (prop in this) && (!(prop in proto) || proto[prop] !== this[prop]); + } + +function text_size(width, height, template) { + var dimension_arr = [height, width].sort(); + var maxFactor = Math.round(dimension_arr[1] / 16), + minFactor = Math.round(dimension_arr[0] / 16); + var text_height = Math.max(template.size, maxFactor); + return { + height: text_height + } +} + +function draw(ctx, dimensions, template, ratio) { + var ts = text_size(dimensions.width, dimensions.height, template); + var text_height = ts.height; + var width = dimensions.width * ratio, height = dimensions.height * ratio; + var font = template.font ? template.font : "sans-serif"; + canvas.width = width; + canvas.height = height; + ctx.textAlign = "center"; + ctx.textBaseline = "middle"; + ctx.fillStyle = template.background; + ctx.fillRect(0, 0, width, height); + ctx.fillStyle = template.foreground; + ctx.font = "bold " + text_height + "px "+font; + var text = template.text ? template.text : (dimensions.width + "x" + dimensions.height); + if (ctx.measureText(text).width / width > 1) { + text_height = template.size / (ctx.measureText(text).width / width); + } + //Resetting font size if necessary + ctx.font = "bold " + (text_height * ratio) + "px "+font; + ctx.fillText(text, (width / 2), (height / 2), width); + return canvas.toDataURL("image/png"); +} + +function render(mode, el, holder, src) { + var dimensions = holder.dimensions, + theme = holder.theme, + text = holder.text ? decodeURIComponent(holder.text) : holder.text; + var dimensions_caption = dimensions.width + "x" + dimensions.height; + theme = (text ? extend(theme, { text: text }) : theme); + theme = (holder.font ? extend(theme, {font: holder.font}) : theme); + + var ratio = 1; + if(window.devicePixelRatio && window.devicePixelRatio > 1){ + ratio = window.devicePixelRatio; + } + + if (mode == "image") { + el.setAttribute("data-src", src); + el.setAttribute("alt", text ? text : theme.text ? theme.text + " [" + dimensions_caption + "]" : dimensions_caption); + + if(fallback || !holder.auto){ + el.style.width = dimensions.width + "px"; + el.style.height = dimensions.height + "px"; + } + + if (fallback) { + el.style.backgroundColor = theme.background; + + } + else{ + el.setAttribute("src", draw(ctx, dimensions, theme, ratio)); + } + } else { + if (!fallback) { + el.style.backgroundImage = "url(" + draw(ctx, dimensions, theme, ratio) + ")"; + el.style.backgroundSize = dimensions.width+"px "+dimensions.height+"px"; + } + } +}; + +function fluid(el, holder, src) { + var dimensions = holder.dimensions, + theme = holder.theme, + text = holder.text; + var dimensions_caption = dimensions.width + "x" + dimensions.height; + theme = (text ? extend(theme, { + text: text + }) : theme); + + var fluid = document.createElement("div"); + + fluid.style.backgroundColor = theme.background; + fluid.style.color = theme.foreground; + fluid.className = el.className + " holderjs-fluid"; + fluid.style.width = holder.dimensions.width + (holder.dimensions.width.indexOf("%")>0?"":"px"); + fluid.style.height = holder.dimensions.height + (holder.dimensions.height.indexOf("%")>0?"":"px"); + fluid.id = el.id; + + el.style.width=0; + el.style.height=0; + + if (theme.text) { + fluid.appendChild(document.createTextNode(theme.text)) + } else { + fluid.appendChild(document.createTextNode(dimensions_caption)) + fluid_images.push(fluid); + setTimeout(fluid_update, 0); + } + + el.parentNode.insertBefore(fluid, el.nextSibling) + + if(window.jQuery){ + jQuery(function($){ + $(el).on("load", function(){ + el.style.width = fluid.style.width; + el.style.height = fluid.style.height; + $(el).show(); + $(fluid).remove(); + }); + }) + } +} + +function fluid_update() { + for (i in fluid_images) { + if(!fluid_images.hasOwnProperty(i)) continue; + var el = fluid_images[i], + label = el.firstChild; + + el.style.lineHeight = el.offsetHeight+"px"; + label.data = el.offsetWidth + "x" + el.offsetHeight; + } +} + +function parse_flags(flags, options) { + + var ret = { + theme: settings.themes.gray + }, render = false; + + for (sl = flags.length, j = 0; j < sl; j++) { + var flag = flags[j]; + if (app.flags.dimensions.match(flag)) { + render = true; + ret.dimensions = app.flags.dimensions.output(flag); + } else if (app.flags.fluid.match(flag)) { + render = true; + ret.dimensions = app.flags.fluid.output(flag); + ret.fluid = true; + } else if (app.flags.colors.match(flag)) { + ret.theme = app.flags.colors.output(flag); + } else if (options.themes[flag]) { + //If a theme is specified, it will override custom colors + ret.theme = options.themes[flag]; + } else if (app.flags.text.match(flag)) { + ret.text = app.flags.text.output(flag); + } else if(app.flags.font.match(flag)){ + ret.font = app.flags.font.output(flag); + } + else if(app.flags.auto.match(flag)){ + ret.auto = true; + } + } + + return render ? ret : false; + +}; + +if (!canvas.getContext) { + fallback = true; +} else { + if (canvas.toDataURL("image/png") + .indexOf("data:image/png") < 0) { + //Android doesn't support data URI + fallback = true; + } else { + var ctx = canvas.getContext("2d"); + } +} + +var fluid_images = []; + +var settings = { + domain: "holder.js", + images: "img", + bgnodes: ".holderjs", + themes: { + "gray": { + background: "#eee", + foreground: "#aaa", + size: 12 + }, + "social": { + background: "#3a5a97", + foreground: "#fff", + size: 12 + }, + "industrial": { + background: "#434A52", + foreground: "#C2F200", + size: 12 + } + }, + stylesheet: ".holderjs-fluid {font-size:16px;font-weight:bold;text-align:center;font-family:sans-serif;margin:0}" +}; + + +app.flags = { + dimensions: { + regex: /^(\d+)x(\d+)$/, + output: function (val) { + var exec = this.regex.exec(val); + return { + width: +exec[1], + height: +exec[2] + } + } + }, + fluid: { + regex: /^([0-9%]+)x([0-9%]+)$/, + output: function (val) { + var exec = this.regex.exec(val); + return { + width: exec[1], + height: exec[2] + } + } + }, + colors: { + regex: /#([0-9a-f]{3,})\:#([0-9a-f]{3,})/i, + output: function (val) { + var exec = this.regex.exec(val); + return { + size: settings.themes.gray.size, + foreground: "#" + exec[2], + background: "#" + exec[1] + } + } + }, + text: { + regex: /text\:(.*)/, + output: function (val) { + return this.regex.exec(val)[1]; + } + }, + font: { + regex: /font\:(.*)/, + output: function(val){ + return this.regex.exec(val)[1]; + } + }, + auto: { + regex: /^auto$/ + } +} + +for (var flag in app.flags) { + if(!app.flags.hasOwnProperty(flag)) continue; + app.flags[flag].match = function (val) { + return val.match(this.regex) + } +} + +app.add_theme = function (name, theme) { + name != null && theme != null && (settings.themes[name] = theme); + return app; +}; + +app.add_image = function (src, el) { + var node = selector(el); + if (node.length) { + for (var i = 0, l = node.length; i < l; i++) { + var img = document.createElement("img") + img.setAttribute("data-src", src); + node[i].appendChild(img); + } + } + return app; +}; + +app.run = function (o) { + var options = extend(settings, o), images = []; + + if(options.images instanceof window.NodeList){ + imageNodes = options.images; + } + else if(options.images instanceof window.Node){ + imageNodes = [options.images]; + } + else{ + imageNodes = selector(options.images); + } + + if(options.elements instanceof window.NodeList){ + bgnodes = options.bgnodes; + } + else if(options.bgnodes instanceof window.Node){ + bgnodes = [options.bgnodes]; + } + else{ + bgnodes = selector(options.bgnodes); + } + + preempted = true; + + for (i = 0, l = imageNodes.length; i < l; i++) images.push(imageNodes[i]); + + var holdercss = document.getElementById("holderjs-style"); + + if(!holdercss){ + holdercss = document.createElement("style"); + holdercss.setAttribute("id", "holderjs-style"); + holdercss.type = "text/css"; + document.getElementsByTagName("head")[0].appendChild(holdercss); + } + + if(holdercss.styleSheet){ + holdercss.styleSheet += options.stylesheet; + } + else{ + holdercss.textContent+= options.stylesheet; + } + + var cssregex = new RegExp(options.domain + "\/(.*?)\"?\\)"); + + for (var l = bgnodes.length, i = 0; i < l; i++) { + var src = window.getComputedStyle(bgnodes[i], null) + .getPropertyValue("background-image"); + var flags = src.match(cssregex); + if (flags) { + var holder = parse_flags(flags[1].split("/"), options); + if (holder) { + render("background", bgnodes[i], holder, src); + } + } + } + + for (var l = images.length, i = 0; i < l; i++) { + var src = images[i].getAttribute("src") || images[i].getAttribute("data-src"); + if (src != null && src.indexOf(options.domain) >= 0) { + var holder = parse_flags(src.substr(src.lastIndexOf(options.domain) + options.domain.length + 1) + .split("/"), options); + if (holder) { + if (holder.fluid) { + fluid(images[i], holder, src); + } else { + render("image", images[i], holder, src); + } + } + } + } + return app; +}; + +contentLoaded(win, function () { + if (window.addEventListener) { + window.addEventListener("resize", fluid_update, false); + window.addEventListener("orientationchange", fluid_update, false); + } else { + window.attachEvent("onresize", fluid_update) + } + preempted || app.run(); +}); + +if ( typeof define === "function" && define.amd ) { + define( "Holder", [], function () { return app; } ); +} + +})(Holder, window); \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/assets/js/holder/index.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/assets/js/holder/index.html (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/assets/js/holder/index.html 2015-03-08 14:32:56 UTC (rev 13011) @@ -0,0 +1 @@ +<script>history.go(-1);</script> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/xotpl/header.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/xotpl/header.html 2015-03-07 16:47:59 UTC (rev 13010) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/xnewage/xotpl/header.html 2015-03-08 14:32:56 UTC (rev 13011) @@ -74,15 +74,16 @@ <{* /.dropdown-alerts *}> </li> <{* /.dropdown *}> + <{xoMemberInfo assign=member_info infos="uname|user_avatar"}> <li class="dropdown"> <a href="#" class="dropdown-toggle account" data-toggle="dropdown"> <div class="avatar"> - <img src="<{xoImgUrl assets/img/avatar.jpg}>" class="img-rounded" alt="avatar" /> + <img src="<{$xoops_url}>/uploads/<{$member_info.user_avatar}>" class="img-rounded" alt="avatar" /> </div> <i class="fa fa-caret-down pull-right"></i> <div class="user-mini pull-right"> <span class="welcome">Welcome,</span> - <span><{$xoops_uname}></span> + <span><{$member_info.uname}></span> </div> </a> <ul class="dropdown-menu dropdown-user"> Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/xoops_version.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/xoops_version.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/xoops_version.php 2015-03-08 14:32:56 UTC (rev 13011) @@ -0,0 +1,442 @@ +<?php +/** + * System xoops_version file + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @version $Id: xoops_version.php 12064 2013-09-17 12:12:00Z beckmi $ + * @revision $Id: xoops_version.php 13008 2015-03-08 13:58:32Z timgno $ + */ + +$modversion['name'] = _MI_SYSTEM_NAME; +$modversion['version'] = 2.11; // irmtfan bug fix: bug fix: remove codes for delete templates +$modversion['description'] = _MI_SYSTEM_DESC; +$modversion['author'] = ''; +$modversion['credits'] = 'The XOOPS Project; MusS, Kraven30, Mage'; +$modversion['help'] = 'system.html'; +$modversion['license'] = "GPL see LICENSE"; +$modversion['official'] = 1; +$modversion['image'] = 'images/system_slogo.png'; +$modversion['dirname'] = 'system'; + +// Admin things +$modversion['hasAdmin'] = 1; +$modversion['adminindex'] = 'admin.php'; +$modversion['adminmenu'] = 'menu.php'; + +$modversion['onUpdate'] = 'include/update.php'; + +// Templates +$modversion['templates'][] = array( 'file' => 'system_imagemanager.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_imagemanager2.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_userinfo.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_userform.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_rss.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_redirect.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_comment.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_comments_flat.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_comments_thread.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_comments_nest.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_siteclosed.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_dummy.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_notification_list.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_notification_select.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_block_dummy.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_homepage.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_bannerlogin.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_banner.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_bannerdisplay.html', 'description' => '' ); +$modversion['templates'][] = array( 'file' => 'system_pagenav.html', 'description' => '' ); + +// Admin Templates +$modversion['templates'][] = array( 'file' => 'system_header.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_banners.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_modules.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_modules_install.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_modules_confirm.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_modules_result.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_avatars.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_smilies.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_blocks.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_blocks_item.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_comments.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_comments_list.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_userrank.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_users.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_preferences.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_mailusers.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_groups.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_images.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_templates.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_filemanager.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_index.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_maintenance.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_help.html', 'description' => '', 'type' => 'admin' ); +$modversion['templates'][] = array( 'file' => 'system_pagenav.html', 'description' => '', 'type' => 'admin' ); + +// Blocks +$modversion['blocks'][] = array( + 'file' => 'system_blocks.php', + 'name' => _MI_SYSTEM_BNAME2, + 'description' => 'Shows user block', + 'show_func' => 'b_system_user_show', + 'template' => 'system_block_user.html'); + +$modversion['blocks'][2]['file'] = 'system_blocks.php'; +$modversion['blocks'][2]['name'] = _MI_SYSTEM_BNAME3; +$modversion['blocks'][2]['description'] = 'Shows login form'; +$modversion['blocks'][2]['show_func'] = 'b_system_login_show'; +$modversion['blocks'][2]['template'] = 'system_block_login.html'; + +$modversion['blocks'][3]['file'] = 'system_blocks.php'; +$modversion['blocks'][3]['name'] = _MI_SYSTEM_BNAME4; +$modversion['blocks'][3]['description'] = 'Shows search form block'; +$modversion['blocks'][3]['show_func'] = 'b_system_search_show'; +$modversion['blocks'][3]['template'] = 'system_block_search.html'; + +$modversion['blocks'][4]['file'] = 'system_blocks.php'; +$modversion['blocks'][4]['name'] = _MI_SYSTEM_BNAME5; +$modversion['blocks'][4]['description'] = 'Shows contents waiting for approval'; +$modversion['blocks'][4]['show_func'] = 'b_system_waiting_show'; +$modversion['blocks'][4]['template'] = 'system_block_waiting.html'; + +$modversion['blocks'][5]['file'] = 'system_blocks.php'; +$modversion['blocks'][5]['name'] = _MI_SYSTEM_BNAME6; +$modversion['blocks'][5]['description'] = 'Shows the main navigation menu of the site'; +$modversion['blocks'][5]['show_func'] = 'b_system_main_show'; +$modversion['blocks'][5]['template'] = 'system_block_mainmenu.html'; + +$modversion['blocks'][6]['file'] = 'system_blocks.php'; +$modversion['blocks'][6]['name'] = _MI_SYSTEM_BNAME7; +$modversion['blocks'][6]['description'] = 'Shows basic info about the site and a link to Recommend Us pop up window'; +$modversion['blocks'][6]['show_func'] = 'b_system_info_show'; +$modversion['blocks'][6]['edit_func'] = 'b_system_info_edit'; +$modversion['blocks'][6]['options'] = '320|190|s_poweredby.gif|1'; +$modversion['blocks'][6]['template'] = 'system_block_siteinfo.html'; + +$modversion['blocks'][7]['file'] = 'system_blocks.php'; +$modversion['blocks'][7]['name'] = _MI_SYSTEM_BNAME8; +$modversion['blocks'][7]['description'] = 'Displays users/guests currently online'; +$modversion['blocks'][7]['show_func'] = 'b_system_online_show'; +$modversion['blocks'][7]['template'] = 'system_block_online.html'; + +$modversion['blocks'][8]['file'] = 'system_blocks.php'; +$modversion['blocks'][8]['name'] = _MI_SYSTEM_BNAME9; +$modversion['blocks'][8]['description'] = 'Top posters'; +$modversion['blocks'][8]['show_func'] = 'b_system_topposters_show'; +$modversion['blocks'][8]['options'] = '10|1'; +$modversion['blocks'][8]['edit_func'] = 'b_system_topposters_edit'; +$modversion['blocks'][8]['template'] = 'system_block_topusers.html'; + +$modversion['blocks'][9]['file'] = 'system_blocks.php'; +$modversion['blocks'][9]['name'] = _MI_SYSTEM_BNAME10; +$modversion['blocks'][9]['description'] = 'Shows most recent users'; +$modversion['blocks'][9]['show_func'] = 'b_system_newmembers_show'; +$modversion['blocks'][9]['options'] = '10|1'; +$modversion['blocks'][9]['edit_func'] = 'b_system_newmembers_edit'; +$modversion['blocks'][9]['template'] = 'system_block_newusers.html'; + +$modversion['blocks'][10]['file'] = 'system_blocks.php'; +$modversion['blocks'][10]['name'] = _MI_SYSTEM_BNAME11; +$modversion['blocks'][10]['description'] = 'Shows most recent comments'; +$modversion['blocks'][10]['show_func'] = 'b_system_comments_show'; +$modversion['blocks'][10]['options'] = '10'; +$modversion['blocks'][10]['edit_func'] = 'b_system_comments_edit'; +$modversion['blocks'][10]['template'] = 'system_block_comments.html'; + +// RMV-NOTIFY: +// Adding a block... +$modversion['blocks'][11]['file'] = 'system_blocks.php'; +$modversion['blocks'][11]['name'] = _MI_SYSTEM_BNAME12; +$modversion['blocks'][11]['description'] = 'Shows notification options'; +$modversion['blocks'][11]['show_func'] = 'b_system_notification_show'; +$modversion['blocks'][11]['template'] = 'system_block_notification.html'; + +$modversion['blocks'][12]['file'] = 'system_blocks.php'; +$modversion['blocks'][12]['name'] = _MI_SYSTEM_BNAME13; +$modversion['blocks'][12]['description'] = 'Shows theme selection box'; +$modversion['blocks'][12]['show_func'] = 'b_system_themes_show'; +$modversion['blocks'][12]['options'] = '0|80'; +$modversion['blocks'][12]['edit_func'] = 'b_system_themes_edit'; +$modversion['blocks'][12]['template'] = 'system_block_themes.html'; + +// Menu +$modversion['hasMain'] = 0; + +// Préférences +$i = 0; +$modversion['config'][$i]['name'] = 'break1'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_GENERAL'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'line_break'; +$modversion['config'][$i]['valuetype'] = 'textbox'; +$modversion['config'][$i]['default'] = 'head'; +$i++; +$modversion['config'][$i]['name'] = 'usetips'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_TIPS'; +$modversion['config'][$i]['description'] = '_MI_SYSTEM_PREFERENCE_TIPS_DSC'; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 1; +$i++; +include_once XOOPS_ROOT_PATH . '/class/xoopslists.php'; +$icons = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/images/icons'); +$modversion['config'][$i]['name'] = 'typeicons'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ICONS'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'select'; +$modversion['config'][$i]['valuetype'] = 'text'; +$modversion['config'][$i]['default'] = 'default'; +$modversion['config'][$i]['options'] = $icons; +$modversion['config'][$i]['category'] = 'global'; +$i++; +$breadcrumb = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/images/breadcrumb'); +$modversion['config'][$i]['name'] = 'typebreadcrumb'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREADCRUMB'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'select'; +$modversion['config'][$i]['valuetype'] = 'text'; +$modversion['config'][$i]['default'] = 'default'; +$modversion['config'][$i]['options'] = $breadcrumb; +$modversion['config'][$i]['category'] = 'global'; +$i++; +$jquery_theme = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . '/modules/system/css/ui'); +$modversion['config'][$i]['name'] = 'jquery_theme'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_JQUERY_THEME'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'select'; +$modversion['config'][$i]['valuetype'] = 'text'; +$modversion['config'][$i]['default'] = 'base'; +$modversion['config'][$i]['options'] = $jquery_theme; +$modversion['config'][$i]['category'] = 'global'; +$i++; +$modversion['config'][$i]['name'] = 'break2'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_ACTIVE'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'line_break'; +$modversion['config'][$i]['valuetype'] = 'textbox'; +$modversion['config'][$i]['default'] = 'head'; +$i++; +$modversion['config'][$i]['name'] = 'active_avatars'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_AVATARS'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'active_banners'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_BANNERS'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'active_blocksadmin'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_BLOCKSADMIN'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'hidden'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 1; +$i++; +$modversion['config'][$i]['name'] = 'active_comments'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_COMMENTS'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'active_filemanager'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_FILEMANAGER'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'hidden'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'active_groups'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_GROUPS'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'hidden'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 1; +$i++; +$modversion['config'][$i]['name'] = 'active_images'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_IMAGES'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'active_mailusers'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_MAILUSERS'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'active_maintenance'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_MAINTENANCE'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'active_modulesadmin'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_MODULESADMIN'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'hidden'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 1; +$i++; +$modversion['config'][$i]['name'] = 'active_preferences'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_PREFERENCES'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'hidden'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 1; +$i++; +$modversion['config'][$i]['name'] = 'active_smilies'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_SMILIES'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'active_tplsets'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_TPLSETS'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'hidden'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 1; +$i++; +$modversion['config'][$i]['name'] = 'active_userrank'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_USERRANK'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'active_users'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_ACTIVE_USERS'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'yesno'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = '1'; +$i++; +$modversion['config'][$i]['name'] = 'break3'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BREAK_PAGER'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'line_break'; +$modversion['config'][$i]['valuetype'] = 'textbox'; +$modversion['config'][$i]['default'] = 'head'; +$i++; +$modversion['config'][$i]['name'] = 'avatars_pager'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_AVATARS_PAGER'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'textbox'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 10; +$i++; +$modversion['config'][$i]['name'] = 'banners_pager'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_BANNERS_PAGER'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'textbox'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 10; +$i++; +$modversion['config'][$i]['name'] = 'comments_pager'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_COMMENTS_PAGER'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'textbox'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 20; +$i++; +$modversion['config'][$i]['name'] = 'groups_pager'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_GROUPS_PAGER'; +$modversion['config'][$i]['description'] = ''; +$modversion['config'][$i]['formtype'] = 'textbox'; +$modversion['config'][$i]['valuetype'] = 'int'; +$modversion['config'][$i]['default'] = 15; +$i++; +$modversion['config'][$i]['name'] = 'images_pager'; +$modversion['config'][$i]['title'] = '_MI_SYSTEM_PREFERENCE_IMAGES_PAGER'; +$modversion['config'][$i]['descript... [truncated message content] |
From: <txm...@us...> - 2015-03-07 16:48:02
|
Revision: 13010 http://sourceforge.net/p/xoops/svn/13010 Author: txmodxoops Date: 2015-03-07 16:47:59 +0000 (Sat, 07 Mar 2015) Log Message: ----------- Updated Fixed bugs Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/dashboard.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/theme.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_page.html Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/dashboard.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/dashboard.css 2015-03-07 11:02:42 UTC (rev 13009) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/dashboard.css 2015-03-07 16:47:59 UTC (rev 13010) @@ -22,17 +22,27 @@ } #page-wrapper { - padding: 15px 15px; - min-height: 600px; - background:#F3F3F3; - + padding: 10px 10px; + min-height: 400px; + z-index: 1; + box-shadow: 0 0 3px #131313; + padding-bottom: 80px !important; + margin-bottom: -78px !important; + overflow: hidden; + -webkit-transition: 0.2s; + -moz-transition: 0.2s; + -o-transition: 0.2s; + transition: 0.2s; + color: inherit; + background:#F3F3F3; } + #page-inner { width:100%; - margin:10px 20px 10px 0px; + margin:2px 7px 2px 0px; background-color:#fff!important; - padding:10px; - min-height:1200px; + padding:8px; + min-height:800px; } #logout { @@ -298,10 +308,14 @@ padding: 5px; } +ul.social-icons { + margin: 0 8px 0; + padding: .8em; +} + ul.social-icons li { display: inline; - margin: 0 10px 0; - padding: 2px; + margin: 0 8px 0; } ul.social-icons li a:hover { @@ -543,8 +557,7 @@ #page-wrapper{ margin: 0 0 0 260px; padding: 15px 30px; - min-height: 1200px; - + min-height: 300px; } .navbar-side { z-index: 1; Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/theme.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/theme.html 2015-03-07 11:02:42 UTC (rev 13009) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/theme.html 2015-03-07 16:47:59 UTC (rev 13010) @@ -6,9 +6,9 @@ <body id="<{$xoops_dirname}>" class="<{$xoops_langcode}>"> <div id="wrapper"> <{includeq file="$theme_tpl/theme_header.html"}> - <{includeq file="$theme_tpl/theme_page.html" }> - </div><{* /#wrapper *}> - <{includeq file="$theme_tpl/theme_footer.html"}> + <{includeq file="$theme_tpl/theme_page.html" }> + <{includeq file="$theme_tpl/theme_footer.html"}> + </div><{* /#wrapper *}> <{includeq file="$theme_tpl/theme_scripts.html"}> </body> </html> \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_page.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_page.html 2015-03-07 11:02:42 UTC (rev 13009) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_page.html 2015-03-07 16:47:59 UTC (rev 13010) @@ -10,22 +10,16 @@ <{if $xo_sys_breadcrumb}> <div class="row"> <div class="col-lg-12"> - <ol class="breadcrumb"> - <{foreach item=breadcrumb from=$xo_sys_breadcrumb}> - <{if $breadcrumb.home}> - <li class="breadcrumb-dashboard"><a href="<{$breadcrumb.link}>" title="<{$breadcrumb.title}>"><i class="fa fa-dashboard"></i> Dashboard</a></li> - <{elseif $breadcrumb.link}> - <li class="breadcrumb-link"><a href="<{$breadcrumb.link}>" title="<{$breadcrumb.title}>"><{$breadcrumb.title}></a></li> - <{else}> - <li class="breadcrumb-title"><{$breadcrumb.title}></li> - <{/if}> - <{/foreach}> - </ol> + <ul class="breadcrumb"> + <{foreach item=item from=$xo_sys_breadcrumb}> + <li><{if $item.link}><a href="<{$item.link}>" title="<{$item.title}>"><{$item.title}></a><{else}><{$item.title}><{/if}></li> + <{/foreach}> + </ul> </div> </div> <{/if}> <{* /.row *}> - <{if $xoops_contents || $xo_system_menu}> + <{if $xoops_contents && $admin_warnings_enable !== false}> <div class="row"> <div class="col-lg-12"> <div class="panel panel-default"> |
From: <txm...@us...> - 2015-03-07 11:02:44
|
Revision: 13009 http://sourceforge.net/p/xoops/svn/13009 Author: txmodxoops Date: 2015-03-07 11:02:42 +0000 (Sat, 07 Mar 2015) Log Message: ----------- Added Breadcrumbs class & smarty plugin Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/breadcrumbs.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/plugins/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/plugins/function.breadcrumbs.php Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/breadcrumbs.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/breadcrumbs.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/breadcrumbs.php 2015-03-07 11:02:42 UTC (rev 13009) @@ -0,0 +1,81 @@ +<?php +/* + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting source code + which is considered copyrighted (c) material of the original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +*/ + +/** + * XOOPS breadcrumbs navigation + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @package class + * @since 2.5.7 + * @author Txmod Xoops (AKA Timgno) + * @version $Id: breadcrumbs.php 12991 2015-02-28 11:18:20Z timgno $ + */ + +defined('XOOPS_ROOT_PATH') or die('Restricted access'); + +class Breadcrumbs +{ + /** + * *#@+ + * + * @access private + */ + /** + * @var array + */ + private $_trail = array(); + /** + * *#@- + */ + + /** + * Constructor + * + * @param null + */ + public function __construct() { } + + /** + * Create step navigation + * + * @param string $title + * @param string $link + * @return string + */ + public function addStep($title, $link = "") + { + $this->_trail[] = array('title' => $title, 'link' => $link); + } + + /** + * Get trail navigation + * + * @return array + */ + public function getTrail() + { + return $this->_trail; + } + + /** + * Get title navigation + * + * @return array + */ + public function getTitle() + { + if(count($this->_trail) == 0) + return null; + + return $this->_trail[count($this->_trail)- 1]['title']; + } +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/plugins/function.breadcrumbs.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/plugins/function.breadcrumbs.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/smarty/plugins/function.breadcrumbs.php 2015-03-07 11:02:42 UTC (rev 13009) @@ -0,0 +1,61 @@ +<?php +/** +* Smarty plugin +* @package Smarty +* @subpackage plugins +*/ + +/** +* Smarty {breadcrumbs} function plugin +* +* Type: function<br> +* Name: breadcrumbs<br> +* Date: March 7, 2015 +* Purpose: Prints breadcrumbs based on the parameters<br> +* Input:<br> +* - trail = index for the trail item +* - separator = how many items there are on a separator +* - truncate = total number of items +* +* Examples: +* <div class="breadcrumbs"> +* <{breadcrumbs trail=$breadcrumbs->getTrail() separator=' » '}> +* </div> +* +* @version 1.0 +* @author Txmod Xoops - <txmodxoops at gmail dot org | www.txmodxoops.org> +* @param array +* @param Smarty +* @return string +*/ + +function smarty_function_breadcrumbs($params, &$smarty) +{ + $defaultParams = array('trail' => array(), 'separator' => ' > ', 'truncate' => 20); + // Inizialize the parameters + foreach ($defaultParams as $k => $v) { + if(!isset($params[$k])) { + $params[$k] = $v; + } + } + // Load the truncate modifier + if($params['truncate'] > 0) { + require_once $smarty->_get_plugin_filepath('modifier', 'truncate'); + } + $links = array(); + $numSteps = count($params['trail']); + for($i = 0; $i < $numSteps; $i++) { + $step = $params['trail'][$i]; + // Truncate title if required + $step['title'] = smarty_modifier_truncate($step['title'], $params['truncate']); + // Build link if it's set and isn't the last step + if(strlen($step['link']) > 0 && $i < $numSteps - 1) { + $links[] = sprintf('<a href="%s" title="%s">%s</a>', htmlspecialChars($step['link']), htmlspecialChars($step['title']), htmlspecialChars($step['title'])); + } else { + // Either the link isn't set, or it's the last step + $links[] = htmlspecialChars($step['title']); + } + } + $breadcrumbs = join($params['separator'], $links); + $smarty->assign("breadcrumbs", $breadcrumbs); +} \ No newline at end of file |
From: <txm...@us...> - 2015-03-06 21:03:21
|
Revision: 13008 http://sourceforge.net/p/xoops/svn/13008 Author: txmodxoops Date: 2015-03-06 21:03:06 +0000 (Fri, 06 Mar 2015) Log Message: ----------- New admin theme bootstrap responsive ( dashboard ) Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/bootstrap-theme.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/bootstrap.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/bootstrap.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/dashboard.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/font-awesome.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/font-awesome.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/font-awesome/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/font-awesome/fonts/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/font-awesome/fonts/fontawesome-webfontba72.eot XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/font-awesome/fonts/fontawesome-webfontba72.svg XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/font-awesome/fonts/fontawesome-webfontba72.ttf XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/font-awesome/fonts/fontawesome-webfontba72.woff XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/font-awesome/fonts/fontawesome-webfontd41d.eot XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/fontawesome-webfontba72.eot XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/fontawesome-webfontba72.svg XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/fontawesome-webfontba72.ttf XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/fontawesome-webfontba72.woff XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/fontawesome-webfontd41d.eot XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/glyphicons-halflings-regular.eot XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/glyphicons-halflings-regular.svg XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/glyphicons-halflings-regular.ttf XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/glyphicons-halflings-regular.woff XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/fonts/glyphicons-halflings-regulard41d.eot XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/avatar.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/avatar_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/banners.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/banners_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/blocks.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/blocks_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/check.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/comments.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/comments_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/configuration.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/configuration_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/edituser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/edituser_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/filemanager.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/filemanager_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/finduser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/finduser_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/groups.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/groups_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/help.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/help_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/icon_options.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/icon_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/images.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/images_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/item.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/mailuser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/mailuser_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/maintenance.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/maintenance_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/modules.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/modules_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/newuser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/prefs.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/prefs_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/smilies.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/smilies_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/tpls.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/tpls_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/userrank.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/userrank_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/icons/waiting.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/img/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/img/1.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/img/2.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/img/3.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/img/4.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/img/find_user.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/img/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/img/logo.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/bootstrap.min.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/dashboard.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/dataTables/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/dataTables/dataTables.bootstrap.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/dataTables/dataTables.bootstrap.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/dataTables/jquery.dataTables.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/jquery-1.10.2.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/jquery.metisMenu.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/morris/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/morris/morris-0.4.3.min.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/morris/morris.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/js/morris/raphael-2.1.0.min.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/dashboard.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/language/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/language/english/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/language/english/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/language/english/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/language/english/localsupport.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/language/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/menu.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/theme.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_accordion.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bccenter.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bcleft.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bcright.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bleft.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_bright.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_footer.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_header.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_icons.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_metas.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_modules.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_page.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_scripts.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/xotpl/theme_tabs.html Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/bootstrap-theme.min.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/bootstrap-theme.min.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/bootstrap-theme.min.css 2015-03-06 21:03:06 UTC (rev 13008) @@ -0,0 +1,5 @@ +/*! + * Bootstrap v3.3.1 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */.btn-default,.btn-primary,.btn-success,.btn-info,.btn-warning,.btn-danger{text-shadow:0 -1px 0 rgba(0,0,0,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 1px rgba(0,0,0,.075)}.btn-default:active,.btn-primary:active,.btn-success:active,.btn-info:active,.btn-warning:active,.btn-danger:active,.btn-default.active,.btn-primary.active,.btn-success.active,.btn-info.active,.btn-warning.active,.btn-danger.active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,.125);box-shadow:inset 0 3px 5px rgba(0,0,0,.125)}.btn-default .badge,.btn-primary .badge,.btn-success .badge,.btn-info .badge,.btn-warning .badge,.btn-danger .badge{text-shadow:none}.btn:active,.btn.active{background-image:none}.btn-default{text-shadow:0 1px 0 #fff;background-image:-webkit-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-o-linear-gradient(top,#fff 0,#e0e0e0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#e0e0e0));background-image:linear-gradient(to bottom,#fff 0,#e0e0e0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe0e0e0', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#dbdbdb;border-color:#ccc}.btn-default:hover,.btn-default:focus{background-color:#e0e0e0;background-position:0 -15px}.btn-default:active,.btn-default.active{background-color:#e0e0e0;border-color:#dbdbdb}.btn-default:disabled,.btn-default[disabled]{background-color:#e0e0e0;background-image:none}.btn-primary{background-image:-webkit-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-o-linear-gradient(top,#337ab7 0,#265a88 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#265a88));background-image:linear-gradient(to bottom,#337ab7 0,#265a88 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff265a88', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#245580}.btn-primary:hover,.btn-primary:focus{background-color:#265a88;background-position:0 -15px}.btn-primary:active,.btn-primary.active{background-color:#265a88;border-color:#245580}.btn-primary:disabled,.btn-primary[disabled]{background-color:#265a88;background-image:none}.btn-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#419641 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#419641));background-image:linear-gradient(to bottom,#5cb85c 0,#419641 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff419641', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#3e8f3e}.btn-success:hover,.btn-success:focus{background-color:#419641;background-position:0 -15px}.btn-success:active,.btn-success.active{background-color:#419641;border-color:#3e8f3e}.btn-success:disabled,.btn-success[disabled]{background-color:#419641;background-image:none}.btn-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#2aabd2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#2aabd2));background-image:linear-gradient(to bottom,#5bc0de 0,#2aabd2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff2aabd2', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#28a4c9}.btn-info:hover,.btn-info:focus{background-color:#2aabd2;background-position:0 -15px}.btn-info:active,.btn-info.active{background-color:#2aabd2;border-color:#28a4c9}.btn-info:disabled,.btn-info[disabled]{background-color:#2aabd2;background-image:none}.btn-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#eb9316 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#eb9316));background-image:linear-gradient(to bottom,#f0ad4e 0,#eb9316 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffeb9316', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#e38d13}.btn-warning:hover,.btn-warning:focus{background-color:#eb9316;background-position:0 -15px}.btn-warning:active,.btn-warning.active{background-color:#eb9316;border-color:#e38d13}.btn-warning:disabled,.btn-warning[disabled]{background-color:#eb9316;background-image:none}.btn-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c12e2a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c12e2a));background-image:linear-gradient(to bottom,#d9534f 0,#c12e2a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc12e2a', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-color:#b92c28}.btn-danger:hover,.btn-danger:focus{background-color:#c12e2a;background-position:0 -15px}.btn-danger:active,.btn-danger.active{background-color:#c12e2a;border-color:#b92c28}.btn-danger:disabled,.btn-danger[disabled]{background-color:#c12e2a;background-image:none}.thumbnail,.img-thumbnail{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.dropdown-menu>li>a:hover,.dropdown-menu>li>a:focus{background-color:#e8e8e8;background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.dropdown-menu>.active>a,.dropdown-menu>.active>a:hover,.dropdown-menu>.active>a:focus{background-color:#2e6da4;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.navbar-default{background-image:-webkit-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-o-linear-gradient(top,#fff 0,#f8f8f8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fff),to(#f8f8f8));background-image:linear-gradient(to bottom,#fff 0,#f8f8f8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff8f8f8', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075);box-shadow:inset 0 1px 0 rgba(255,255,255,.15),0 1px 5px rgba(0,0,0,.075)}.navbar-default .navbar-nav>.open>a,.navbar-default .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-o-linear-gradient(top,#dbdbdb 0,#e2e2e2 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dbdbdb),to(#e2e2e2));background-image:linear-gradient(to bottom,#dbdbdb 0,#e2e2e2 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdbdbdb', endColorstr='#ffe2e2e2', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.075);box-shadow:inset 0 3px 9px rgba(0,0,0,.075)}.navbar-brand,.navbar-nav>li>a{text-shadow:0 1px 0 rgba(255,255,255,.25)}.navbar-inverse{background-image:-webkit-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-o-linear-gradient(top,#3c3c3c 0,#222 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#3c3c3c),to(#222));background-image:linear-gradient(to bottom,#3c3c3c 0,#222 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff3c3c3c', endColorstr='#ff222222', GradientType=0);filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);background-repeat:repeat-x}.navbar-inverse .navbar-nav>.open>a,.navbar-inverse .navbar-nav>.active>a{background-image:-webkit-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-o-linear-gradient(top,#080808 0,#0f0f0f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#080808),to(#0f0f0f));background-image:linear-gradient(to bottom,#080808 0,#0f0f0f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff080808', endColorstr='#ff0f0f0f', GradientType=0);background-repeat:repeat-x;-webkit-box-shadow:inset 0 3px 9px rgba(0,0,0,.25);box-shadow:inset 0 3px 9px rgba(0,0,0,.25)}.navbar-inverse .navbar-brand,.navbar-inverse .navbar-nav>li>a{text-shadow:0 -1px 0 rgba(0,0,0,.25)}.navbar-static-top,.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}@media (max-width:767px){.navbar .navbar-nav .open .dropdown-menu>.active>a,.navbar .navbar-nav .open .dropdown-menu>.active>a:hover,.navbar .navbar-nav .open .dropdown-menu>.active>a:focus{color:#fff;background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}}.alert{text-shadow:0 1px 0 rgba(255,255,255,.2);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05);box-shadow:inset 0 1px 0 rgba(255,255,255,.25),0 1px 2px rgba(0,0,0,.05)}.alert-success{background-image:-webkit-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#c8e5bc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#c8e5bc));background-image:linear-gradient(to bottom,#dff0d8 0,#c8e5bc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffc8e5bc', GradientType=0);background-repeat:repeat-x;border-color:#b2dba1}.alert-info{background-image:-webkit-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#b9def0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#b9def0));background-image:linear-gradient(to bottom,#d9edf7 0,#b9def0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffb9def0', GradientType=0);background-repeat:repeat-x;border-color:#9acfea}.alert-warning{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#f8efc0 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#f8efc0));background-image:linear-gradient(to bottom,#fcf8e3 0,#f8efc0 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fff8efc0', GradientType=0);background-repeat:repeat-x;border-color:#f5e79e}.alert-danger{background-image:-webkit-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-o-linear-gradient(top,#f2dede 0,#e7c3c3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#e7c3c3));background-image:linear-gradient(to bottom,#f2dede 0,#e7c3c3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffe7c3c3', GradientType=0);background-repeat:repeat-x;border-color:#dca7a7}.progress{background-image:-webkit-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#ebebeb 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#ebebeb),to(#f5f5f5));background-image:linear-gradient(to bottom,#ebebeb 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffebebeb', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x}.progress-bar{background-image:-webkit-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-o-linear-gradient(top,#337ab7 0,#286090 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#286090));background-image:linear-gradient(to bottom,#337ab7 0,#286090 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff286090', GradientType=0);background-repeat:repeat-x}.progress-bar-success{background-image:-webkit-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-o-linear-gradient(top,#5cb85c 0,#449d44 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5cb85c),to(#449d44));background-image:linear-gradient(to bottom,#5cb85c 0,#449d44 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5cb85c', endColorstr='#ff449d44', GradientType=0);background-repeat:repeat-x}.progress-bar-info{background-image:-webkit-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-o-linear-gradient(top,#5bc0de 0,#31b0d5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#5bc0de),to(#31b0d5));background-image:linear-gradient(to bottom,#5bc0de 0,#31b0d5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff31b0d5', GradientType=0);background-repeat:repeat-x}.progress-bar-warning{background-image:-webkit-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-o-linear-gradient(top,#f0ad4e 0,#ec971f 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f0ad4e),to(#ec971f));background-image:linear-gradient(to bottom,#f0ad4e 0,#ec971f 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff0ad4e', endColorstr='#ffec971f', GradientType=0);background-repeat:repeat-x}.progress-bar-danger{background-image:-webkit-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-o-linear-gradient(top,#d9534f 0,#c9302c 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9534f),to(#c9302c));background-image:linear-gradient(to bottom,#d9534f 0,#c9302c 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9534f', endColorstr='#ffc9302c', GradientType=0);background-repeat:repeat-x}.progress-bar-striped{background-image:-webkit-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:-o-linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent)}.list-group{border-radius:4px;-webkit-box-shadow:0 1px 2px rgba(0,0,0,.075);box-shadow:0 1px 2px rgba(0,0,0,.075)}.list-group-item.active,.list-group-item.active:hover,.list-group-item.active:focus{text-shadow:0 -1px 0 #286090;background-image:-webkit-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2b669a 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2b669a));background-image:linear-gradient(to bottom,#337ab7 0,#2b669a 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2b669a', GradientType=0);background-repeat:repeat-x;border-color:#2b669a}.list-group-item.active .badge,.list-group-item.active:hover .badge,.list-group-item.active:focus .badge{text-shadow:none}.panel{-webkit-box-shadow:0 1px 2px rgba(0,0,0,.05);box-shadow:0 1px 2px rgba(0,0,0,.05)}.panel-default>.panel-heading{background-image:-webkit-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-o-linear-gradient(top,#f5f5f5 0,#e8e8e8 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f5f5f5),to(#e8e8e8));background-image:linear-gradient(to bottom,#f5f5f5 0,#e8e8e8 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#ffe8e8e8', GradientType=0);background-repeat:repeat-x}.panel-primary>.panel-heading{background-image:-webkit-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-o-linear-gradient(top,#337ab7 0,#2e6da4 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#337ab7),to(#2e6da4));background-image:linear-gradient(to bottom,#337ab7 0,#2e6da4 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff337ab7', endColorstr='#ff2e6da4', GradientType=0);background-repeat:repeat-x}.panel-success>.panel-heading{background-image:-webkit-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-o-linear-gradient(top,#dff0d8 0,#d0e9c6 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#dff0d8),to(#d0e9c6));background-image:linear-gradient(to bottom,#dff0d8 0,#d0e9c6 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffdff0d8', endColorstr='#ffd0e9c6', GradientType=0);background-repeat:repeat-x}.panel-info>.panel-heading{background-image:-webkit-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-o-linear-gradient(top,#d9edf7 0,#c4e3f3 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#d9edf7),to(#c4e3f3));background-image:linear-gradient(to bottom,#d9edf7 0,#c4e3f3 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffd9edf7', endColorstr='#ffc4e3f3', GradientType=0);background-repeat:repeat-x}.panel-warning>.panel-heading{background-image:-webkit-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-o-linear-gradient(top,#fcf8e3 0,#faf2cc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#fcf8e3),to(#faf2cc));background-image:linear-gradient(to bottom,#fcf8e3 0,#faf2cc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fffcf8e3', endColorstr='#fffaf2cc', GradientType=0);background-repeat:repeat-x}.panel-danger>.panel-heading{background-image:-webkit-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-o-linear-gradient(top,#f2dede 0,#ebcccc 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#f2dede),to(#ebcccc));background-image:linear-gradient(to bottom,#f2dede 0,#ebcccc 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2dede', endColorstr='#ffebcccc', GradientType=0);background-repeat:repeat-x}.well{background-image:-webkit-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-o-linear-gradient(top,#e8e8e8 0,#f5f5f5 100%);background-image:-webkit-gradient(linear,left top,left bottom,from(#e8e8e8),to(#f5f5f5));background-image:linear-gradient(to bottom,#e8e8e8 0,#f5f5f5 100%);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffe8e8e8', endColorstr='#fff5f5f5', GradientType=0);background-repeat:repeat-x;border-color:#dcdcdc;-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1);box-shadow:inset 0 1px 3px rgba(0,0,0,.05),0 1px 0 rgba(255,255,255,.1)} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/bootstrap.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/bootstrap.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/dashboard/assets/css/bootstrap.css 2015-03-06 21:03:06 UTC (rev 13008) @@ -0,0 +1,5781 @@ +/*! + * Bootstrap v3.1.1 (http://getbootstrap.com) + * Copyright 2011-2014 Twitter, Inc. + * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) + */ + +/*! normalize.css v3.0.0 | MIT License | git.io/normalize */ +html { + font-family: sans-serif; + -webkit-text-size-adjust: 100%; + -ms-text-size-adjust: 100%; +} +body { + margin: 0; +} +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +main, +nav, +section, +summary { + display: block; +} +audio, +canvas, +progress, +video { + display: inline-block; + vertical-align: baseline; +} +audio:not([controls]) { + display: none; + height: 0; +} +[hidden], +template { + display: none; +} +a { + background: transparent; +} +a:active, +a:hover { + outline: 0; +} +abbr[title] { + border-bottom: 1px dotted; +} +b, +strong { + font-weight: bold; +} +dfn { + font-style: italic; +} +h1 { + margin: .67em 0; + font-size: 2em; +} +mark { + color: #000; + background: #ff0; +} +small { + font-size: 80%; +} +sub, +sup { + position: relative; + font-size: 75%; + line-height: 0; + vertical-align: baseline; +} +sup { + top: -.5em; +} +sub { + bottom: -.25em; +} +img { + border: 0; +} +svg:not(:root) { + overflow: hidden; +} +figure { + margin: 1em 40px; +} +hr { + height: 0; + -moz-box-sizing: content-box; + box-sizing: content-box; +} +pre { + overflow: auto; +} +code, +kbd, +pre, +samp { + font-family: monospace, monospace; + font-size: 1em; +} +button, +input, +optgroup, +select, +textarea { + margin: 0; + font: inherit; + color: inherit; +} +button { + overflow: visible; +} +button, +select { + text-transform: none; +} +button, +html input[type="button"], +input[type="reset"], +input[type="submit"] { + -webkit-appearance: button; + cursor: pointer; +} +button[disabled], +html input[disabled] { + cursor: default; +} +button::-moz-focus-inner, +input::-moz-focus-inner { + padding: 0; + border: 0; +} +input { + line-height: normal; +} +input[type="checkbox"], +input[type="radio"] { + box-sizing: border-box; + padding: 0; +} +input[type="number"]::-webkit-inner-spin-button, +input[type="number"]::-webkit-outer-spin-button { + height: auto; +} +input[type="search"] { + -webkit-box-sizing: content-box; + -moz-box-sizing: content-box; + box-sizing: content-box; + -webkit-appearance: textfield; +} +input[type="search"]::-webkit-search-cancel-button, +input[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} +fieldset { + padding: .35em .625em .75em; + margin: 0 2px; + border: 1px solid #c0c0c0; +} +legend { + padding: 0; + border: 0; +} +textarea { + overflow: auto; +} +optgroup { + font-weight: bold; +} +table { + border-spacing: 0; + border-collapse: collapse; +} +td, +th { + padding: 0; +} +@media print { + * { + color: #000 !important; + text-shadow: none !important; + background: transparent !important; + box-shadow: none !important; + } + a, + a:visited { + text-decoration: underline; + } + a[href]:after { + content: " (" attr(href) ")"; + } + abbr[title]:after { + content: " (" attr(title) ")"; + } + a[href^="javascript:"]:after, + a[href^="#"]:after { + content: ""; + } + pre, + blockquote { + border: 1px solid #999; + + page-break-inside: avoid; + } + thead { + display: table-header-group; + } + tr, + img { + page-break-inside: avoid; + } + img { + max-width: 100% !important; + } + p, + h2, + h3 { + orphans: 3; + widows: 3; + } + h2, + h3 { + page-break-after: avoid; + } + select { + background: #fff !important; + } + .navbar { + display: none; + } + .table td, + .table th { + background-color: #fff !important; + } + .btn > .caret, + .dropup > .btn > .caret { + border-top-color: #000 !important; + } + .label { + border: 1px solid #000; + } + .table { + border-collapse: collapse !important; + } + .table-bordered th, + .table-bordered td { + border: 1px solid #ddd !important; + } +} +* { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +*:before, +*:after { + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} +html { + font-size: 62.5%; + + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); +} +body { + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-size: 14px; + line-height: 1.42857143; + color: #333; + background-color: #fff; +} +input, +button, +select, +textarea { + font-family: inherit; + font-size: inherit; + line-height: inherit; +} +a { + color: #428bca; + text-decoration: none; +} +a:hover, +a:focus { + color: #2a6496; + text-decoration: underline; +} +a:focus { + outline: thin dotted; + outline: 5px auto -webkit-focus-ring-color; + outline-offset: -2px; +} +figure { + margin: 0; +} +img { + vertical-align: middle; +} +.img-responsive, +.thumbnail > img, +.thumbnail a > img, +.carousel-inner > .item > img, +.carousel-inner > .item > a > img { + display: block; + max-width: 100%; + height: auto; +} +.img-rounded { + border-radius: 6px; +} +.img-thumbnail { + display: inline-block; + max-width: 100%; + height: auto; + padding: 4px; + line-height: 1.42857143; + background-color: #fff; + border: 1px solid #ddd; + border-radius: 4px; + -webkit-transition: all .2s ease-in-out; + transition: all .2s ease-in-out; +} +.img-circle { + border-radius: 50%; +} +hr { + margin-top: 20px; + margin-bottom: 20px; + border: 0; + border-top: 1px solid #eee; +} +.sr-only { + position: absolute; + width: 1px; + height: 1px; + padding: 0; + margin: -1px; + overflow: hidden; + clip: rect(0, 0, 0, 0); + border: 0; +} +h1, +h2, +h3, +h4, +h5, +h6, +.h1, +.h2, +.h3, +.h4, +.h5, +.h6 { + font-family: inherit; + font-weight: 500; + line-height: 1.1; + color: inherit; +} +h1 small, +h2 small, +h3 small, +h4 small, +h5 small, +h6 small, +.h1 small, +.h2 small, +.h3 small, +.h4 small, +.h5 small, +.h6 small, +h1 .small, +h2 .small, +h3 .small, +h4 .small, +h5 .small, +h6 .small, +.h1 .small, +.h2 .small, +.h3 .small, +.h4 .small, +.h5 .small, +.h6 .small { + font-weight: normal; + line-height: 1; + color: #999; +} +h1, +.h1, +h2, +.h2, +h3, +.h3 { + margin-top: 20px; + margin-bottom: 10px; +} +h1 small, +.h1 small, +h2 small, +.h2 small, +h3 small, +.h3 small, +h1 .small, +.h1 .small, +h2 .small, +.h2 .small, +h3 .small, +.h3 .small { + font-size: 65%; +} +h4, +.h4, +h5, +.h5, +h6, +.h6 { + margin-top: 10px; + margin-bottom: 10px; +} +h4 small, +.h4 small, +h5 small, +.h5 small, +h6 small, +.h6 small, +h4 .small, +.h4 .small, +h5 .small, +.h5 .small, +h6 .small, +.h6 .small { + font-size: 75%; +} +h1, +.h1 { + font-size: 36px; +} +h2, +.h2 { + font-size: 30px; +} +h3, +.h3 { + font-size: 24px; +} +h4, +.h4 { + font-size: 18px; +} +h5, +.h5 { + font-size: 14px; +} +h6, +.h6 { + font-size: 12px; +} +p { + margin: 0 0 10px; +} +.lead { + margin-bottom: 20px; + font-size: 16px; + font-weight: 200; + line-height: 1.4; +} +@media (min-width: 768px) { + .lead { + font-size: 21px; + } +} +small, +.small { + font-size: 85%; +} +cite { + font-style: normal; +} +.text-left { + text-align: left; +} +.text-right { + text-align: right; +} +.text-center { + text-align: center; +} +.text-justify { + text-align: justify; +} +.text-muted { + color: #999; +} +.text-primary { + color: #428bca; +} +a.text-primary:hover { + color: #3071a9; +} +.text-success { + color: #3c763d; +} +a.text-success:hover { + color: #2b542c; +} +.text-info { + color: #31708f; +} +a.text-info:hover { + color: #245269; +} +.text-warning { + color: #8a6d3b; +} +a.text-warning:hover { + color: #66512c; +} +.text-danger { + color: #a94442; +} +a.text-danger:hover { + color: #843534; +} +.bg-primary { + color: #fff; + background-color: #428bca; +} +a.bg-primary:hover { + background-color: #3071a9; +} +.bg-success { + background-color: #dff0d8; +} +a.bg-success:hover { + background-color: #c1e2b3; +} +.bg-info { + background-color: #d9edf7; +} +a.bg-info:hover { + background-color: #afd9ee; +} +.bg-warning { + background-color: #fcf8e3; +} +a.bg-warning:hover { + background-color: #f7ecb5; +} +.bg-danger { + background-color: #f2dede; +} +a.bg-danger:hover { + background-color: #e4b9b9; +} +.page-header { + padding-bottom: 9px; + margin: 40px 0 20px; + border-bottom: 1px solid #eee; +} +ul, +ol { + margin-top: 0; + margin-bottom: 10px; +} +ul ul, +ol ul, +ul ol, +ol ol { + margin-bottom: 0; +} +.list-unstyled { + padding-left: 0; + list-style: none; +} +.list-inline { + padding-left: 0; + margin-left: -5px; + list-style: none; +} +.list-inline > li { + display: inline-block; + padding-right: 5px; + padding-left: 5px; +} +dl { + margin-top: 0; + margin-bottom: 20px; +} +dt, +dd { + line-height: 1.42857143; +} +dt { + font-weight: bold; +} +dd { + margin-left: 0; +} +@media (min-width: 768px) { + .dl-horizontal dt { + float: left; + width: 160px; + overflow: hidden; + clear: left; + text-align: right; + text-overflow: ellipsis; + white-space: nowrap; + } + .dl-horizontal dd { + margin-left: 180px; + } +} +abbr[title], +abbr[data-original-title] { + cursor: help; + border-bottom: 1px dotted #999; +} +.initialism { + font-size: 90%; + text-transform: uppercase; +} +blockquote { + padding: 10px 20px; + margin: 0 0 20px; + font-size: 17.5px; + border-left: 5px solid #eee; +} +blockquote p:last-child, +blockquote ul:last-child, +blockquote ol:last-child { + margin-bottom: 0; +} +blockquote footer, +blockquote small, +blockquote .small { + display: block; + font-size: 80%; + line-height: 1.42857143; + color: #999; +} +blockquote footer:before, +blockquote small:before, +blockquote .small:before { + content: '\2014 \00A0'; +} +.blockquote-reverse, +blockquote.pull-right { + padding-right: 15px; + padding-left: 0; + text-align: right; + border-right: 5px solid #eee; + border-left: 0; +} +.blockquote-reverse footer:before, +blockquote.pull-right footer:before, +.blockquote-reverse small:before, +blockquote.pull-right small:before, +.blockquote-reverse .small:before, +blockquote.pull-right .small:before { + content: ''; +} +.blockquote-reverse footer:after, +blockquote.pull-right footer:after, +.blockquote-reverse small:after, +blockquote.pull-right small:after, +.blockquote-reverse .small:after, +blockquote.pull-right .small:after { + content: '\00A0 \2014'; +} +blockquote:before, +blockquote:after { + content: ""; +} +address { + margin-bottom: 20px; + font-style: normal; + line-height: 1.42857143; +} +code, +kbd, +pre, +samp { + font-family: Menlo, Monaco, Consolas, "Courier New", monospace; +} +code { + padding: 2px 4px; + font-size: 90%; + color: #c7254e; + white-space: nowrap; + background-color: #f9f2f4; + border-radius: 4px; +} +kbd { + padding: 2px 4px; + font-size: 90%; + color: #fff; + background-color: #333; + border-radius: 3px; + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, .25); +} +pre { + display: block; + padding: 9.5px; + margin: 0 0 10px; + font-size: 13px; + line-height: 1.42857143; + color: #333; + word-break: break-all; + word-wrap: break-word; + background-color: #f5f5f5; + border: 1px solid #ccc; + border-radius: 4px; +} +pre code { + padding: 0; + font-size: inherit; + color: inherit; + white-space: pre-wrap; + background-color: transparent; + border-radius: 0; +} +.pre-scrollable { + max-height: 340px; + overflow-y: scroll; +} +.container { + padding-right: 15px; + padding-left: 15px; + margin-right: auto; + margin-left: auto; +} +@media (min-width: 768px) { + .container { + width: 750px; + } +} +@media (min-width: 992px) { + .container { + width: 970px; + } +} +@media (min-width: 1200px) { + .container { + width: 1170px; + } +} +.container-fluid { + padding-right: 15px; + padding-left: 15px; + margin-right: auto; + margin-left: auto; +} +.row { + margin-right: -15px; + margin-left: -15px; +} +.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { + position: relative; + min-height: 1px; + padding-right: 15px; + padding-left: 15px; +} +.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { + float: left; +} +.col-xs-12 { + width: 100%; +} +.col-xs-11 { + width: 91.66666667%; +} +.col-xs-10 { + width: 83.33333333%; +} +.col-xs-9 { + width: 75%; +} +.col-xs-8 { + width: 66.66666667%; +} +.col-xs-7 { + width: 58.33333333%; +} +.col-xs-6 { + width: 50%; +} +.col-xs-5 { + width: 41.66666667%; +} +.col-xs-4 { + width: 33.33333333%; +} +.col-xs-3 { + width: 25%; +} +.col-xs-2 { + width: 16.66666667%; +} +.col-xs-1 { + width: 8.33333333%; +} +.col-xs-pull-12 { + right: 100%; +} +.col-xs-pull-11 { + right: 91.66666667%; +} +.col-xs-pull-10 { + right: 83.33333333%; +} +.col-xs-pull-9 { + right: 75%; +} +.col-xs-pull-8 { + right: 66.66666667%; +} +.col-xs-pull-7 { + right: 58.33333333%; +} +.col-xs-pull-6 { + right: 50%; +} +.col-xs-pull-5 { + right: 41.66666667%; +} +.col-xs-pull-4 { + right: 33.33333333%; +} +.col-xs-pull-3 { + right: 25%; +} +.col-xs-pull-2 { + right: 16.66666667%; +} +.col-xs-pull-1 { + right: 8.33333333%; +} +.col-xs-pull-0 { + right: 0; +} +.col-xs-push-12 { + left: 100%; +} +.col-xs-push-11 { + left: 91.66666667%; +} +.col-xs-push-10 { + left: 83.33333333%; +} +.col-xs-push-9 { + left: 75%; +} +.col-xs-push-8 { + left: 66.66666667%; +} +.col-xs-push-7 { + left: 58.33333333%; +} +.col-xs-push-6 { + left: 50%; +} +.col-xs-push-5 { + left: 41.66666667%; +} +.col-xs-push-4 { + left: 33.33333333%; +} +.col-xs-push-3 { + left: 25%; +} +.col-xs-push-2 { + left: 16.66666667%; +} +.col-xs-push-1 { + left: 8.33333333%; +} +.col-xs-push-0 { + left: 0; +} +.col-xs-offset-12 { + margin-left: 100%; +} +.col-xs-offset-11 { + margin-left: 91.66666667%; +} +.col-xs-offset-10 { + margin-left: 83.33333333%; +} +.col-xs-offset-9 { + margin-left: 75%; +} +.col-xs-offset-8 { + margin-left: 66.66666667%; +} +.col-xs-offset-7 { + margin-left: 58.33333333%; +} +.col-xs-offset-6 { + margin-left: 50%; +} +.col-xs-offset-5 { + margin-left: 41.66666667%; +} +.col-xs-offset-4 { + margin-left: 33.33333333%; +} +.col-xs-offset-3 { + margin-left: 25%; +} +.col-xs-offset-2 { + margin-left: 16.66666667%; +} +.col-xs-offset-1 { + margin-left: 8.33333333%; +} +.col-xs-offset-0 { + margin-left: 0; +} +@media (min-width: 768px) { + .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { + float: left; + } + .col-sm-12 { + width: 100%; + } + .col-sm-11 { + width: 91.66666667%; + } + .col-sm-10 { + width: 83.33333333%; + } + .col-sm-9 { + width: 75%; + } + .col-sm-8 { + width: 66.66666667%; + } + .col-sm-7 { + width: 58.33333333%; + } + .col-sm-6 { + width: 50%; + } + .col-sm-5 { + width: 41.66666667%; + } + .col-sm-4 { + width: 33.33333333%; + } + .col-sm-3 { + width: 25%; + } + .col-sm-2 { + width: 16.66666667%; + } + .col-sm-1 { + width: 8.33333333%; + } + .col-sm-pull-12 { + right: 100%; + } + .col-sm-pull-11 { + right: 91.66666667%; + } + .col-sm-pull-10 { + right: 83.33333333%; + } + .col-sm-pull-9 { + right: 75%; + } + .col-sm-pull-8 { + right: 66.66666667%; + } + .col-sm-pull-7 { + right: 58.33333333%; + } + .col-sm-pull-6 { + right: 50%; + } + .col-sm-pull-5 { + right: 41.66666667%; + } + .col-sm-pull-4 { + right: 33.33333333%; + } + .col-sm-pull-3 { + right: 25%; + } + .col-sm-pull-2 { + right: 16.66666667%; + } + .col-sm-pull-1 { + right: 8.33333333%; + } + .col-sm-pull-0 { + right: 0; + } + .col-sm-push-12 { + left: 100%; + } + .col-sm-push-11 { + left: 91.66666667%; + } + .col-sm-push-10 { + left: 83.33333333%; + } + .col-sm-push-9 { + left: 75%; + } + .col-sm-push-8 { + left: 66.66666667%; + } + .col-sm-push-7 { + left: 58.33333333%; + } + .col-sm-push-6 { + left: 50%; + } + .col-sm-push-5 { + left: 41.66666667%; + } + .col-sm-push-4 { + left: 33.33333333%; + } + .col-sm-push-3 { + left: 25%; + } + .col-sm-push-2 { + left: 16.66666667%; + } + .col-sm-push-1 { + left: 8.33333333%; + } + .col-sm-push-0 { + left: 0; + } + .col-sm-offset-12 { + margin-left: 100%; + } + .col-sm-offset-11 { + margin-left: 91.66666667%; + } + .col-sm-offset-10 { + margin-left: 83.33333333%; + } + .col-sm-offset-9 { + margin-left: 75%; + } + .col-sm-offset-8 { + margin-left: 66.66666667%; + } + .col-sm-offset-7 { + margin-left: 58.33333333%; + } + .col-sm-offset-6 { + margin-left: 50%; + } + .col-sm-offset-5 { + margin-left: 41.66666667%; + } + .col-sm-offset-4 { + margin-left: 33.33333333%; + } + .col-sm-offset-3 { + margin-left: 25%; + } + .col-sm-offset-2 { + margin-left: 16.66666667%; + } + .col-sm-offset-1 { + margin-left: 8.33333333%; + } + .col-sm-offset-0 { + margin-left: 0; + } +} +@media (min-width: 992px) { + .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { + float: left; + } + .col-md-12 { + width: 100%; + } + .col-md-11 { + width: 91.66666667%; + } + .col-md-10 { + width: 83.33333333%; + } + .col-md-9 { + width: 75%; + } + .col-md-8 { + width: 66.66666667%; + } + .col-md-7 { + width: 58.33333333%; + } + .col-md-6 { + width: 50%; + } + .col-md-5 { + width: 41.66666667%; + } + .col-md-4 { + width: 33.33333333%; + } + .col-md-3 { + width: 25%; + } + .col-md-2 { + width: 16.66666667%; + } + .col-md-1 { + width: 8.33333333%; + } + .col-md-pull-12 { + right: 100%; + } + .col-md-pull-11 { + right: 91.66666667%; + } + .col-md-pull-10 { + right: 83.33333333%; + } + .col-md-pull-9 { + right: 75%; + } + .col-md-pull-8 { + right: 66.66666667%; + } + .col-md-pull-7 { + right: 58.33333333%; + } + .col-md-pull-6 { + right: 50%; + } + .col-md-pull-5 { + right: 41.66666667%; + } + .col-md-pull-4 { + right: 33.33333333%; + } + .col-md-pull-3 { + right: 25%; + } + .col-md-pull-2 { + right: 16.66666667%; + } + .col-md-pull-1 { + right: 8.33333333%; + } + .col-md-pull-0 { + right: 0; + } + .col-md-push-12 { + left: 100%; + } + .col-md-push-11 { + left: 91.66666667%; + } + .col-md-push-10 { + left: 83.33333333%; + } + .col-md-push-9 { + left: 75%; + } + .col-md-push-8 { + left: 66.66666667%; + } + .col-md-push-7 { + left: 58.33333333%; + } + .col-md-push-6 { + left: 50%; + } + .col-md-push-5 { + left: 41.66666667%; + } + .col-md-push-4 { + left: 33.33333333%; + } + .col-md-push-3 { + left: 25%; + } + .col-md-push-2 { + left: 16.66666667%; + } + .col-md-push-1 { + left: 8.33333333%; + } + .col-md-push-0 { + left: 0; + } + .col-md-offset-12 { + margin-left: 100%; + } + .col-md-offset-11 { + margin-left: 91.66666667%; + } + .col-md-offset-10 { + margin-left: 83.33333333%; + } + .col-md-offset-9 { + margin-left: 75%; + } + .col-md-offset-8 { + margin-left: 66.66666667%; + } + .col-md-offset-7 { + margin-left: 58.33333333%; + } + .col-md-offset-6 { + margin-left: 50%; + } + .col-md-offset-5 { + margin-left: 41.66666667%; + } + .col-md-offset-4 { + margin-left: 33.33333333%; + } + .col-md-offset-3 { + margin-left: 25%; + } + .col-md-offset-2 { + margin-left: 16.66666667%; + } + .col-md-offset-1 { + margin-left: 8.33333333%; + } + .col-md-offset-0 { + margin-left: 0; + } +} +@media (min-width: 1200px) { + .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { + float: left; + } + .col-lg-12 { + width: 100%; + } + .col-lg-11 { + width: 91.66666667%; + } + .col-lg-10 { + width: 83.33333333%; + } + .col-lg-9 { + width: 75%; + } + .col-lg-8 { + width: 66.66666667%; + } + .col-lg-7 { + width: 58.33333333%; + } + .col-lg-6 { + width: 50%; + } + .col-lg-5 { + width: 41.66666667%; + } + .col-lg-4 { + width: 33.33333333%; + } + .col-lg-3 { + width: 25%; + } + .col-lg-2 { + width: 16.66666667%; + } + .col-lg-1 { + width: 8.33333333%; + } + .col-lg-pull-12 { + right: 100%; + } + .col-lg-pull-11 { + right: 91.66666667%; + } + .col-lg-pull-10 { + right: 83.33333333%; + } + .col-lg-pull-9 { + right: 75%; + } + .col-lg-pull-8 { + right: 66.66666667%; + } + .col-lg-pull-7 { + right: 58.33333333%; + } + .col-lg-pull-6 { + right: 50%; + } + .col-lg-pull-5 { + right: 41.66666667%; + } + .col-lg-pull-4 { + right: 33.33333333%; + } + .col-lg-pull-3 { + right: 25%; + } + .col-lg-pull-2 { + right: 16.66666667%; + } + .col-lg-pull-1 { + right: 8.33333333%; + } + .col-lg-pull-0 { + right: 0; + } + .col-lg-push-12 { + left: 100%; + } + .col-lg-push-11 { + left: 91.66666667%; + } + .col-lg-push-10 { + left: 83.33333333%; + } + .col-lg-push-9 { + left: 75%; + } + .col-lg-push-8 { + left: 66.66666667%; + } + .col-lg-push-7 { + left: 58.33333333%; + } + .col-lg-push-6 { + left: 50%; + } + .col-lg-push-5 { + left: 41.66666667%; + } + .col-lg-push-4 { + left: 33.33333333%; + } + .col-lg-push-3 { + left: 25%; + } + .col-lg-push-2 { + left: 16.66666667%; + } + .col-lg-push-1 { + left: 8.33333333%; + } + .col-lg-push-0 { + left: 0; + } + .col-lg-offset-12 { + margin-left: 100%; + } + .col-lg-offset-11 { + margin-left: 91.66666667%; + } + .col-lg-offset-10 { + margin-left: 83.33333333%; + } + .col-lg-offset-9 { + margin-left: 75%; + } + .col-lg-offset-8 { + margin-left: 66.66666667%; + } + .col-lg-offset-7 { + margin-left: 58.33333333%; + } + .col-lg-offset-6 { + margin-left: 50%; + } + .col-lg-offset-5 { + margin-left: 41.66666667%; + } + .col-lg-offset-4 { + margin-left: 33.33333333%; + } + .col-lg-offset-3 { + margin-left: 25%; + } + .col-lg-offset-2 { + margin-left: 16.66666667%; + } + .col-lg-offset-1 { + margin-left: 8.33333333%; + } + .col-lg-offset-0 { + margin-left: 0; + } +} +table { + max-width: 100%; + background-color: transparent; +} +th { + text-align: left; +} +.table { + width: 100%; + margin-bottom: 20px; +} +.table > thead > tr > th, +.table > tbody > tr > th, +.table > tfoot > tr > th, +.table > thead > tr > td, +.table > tbody > tr > td, +.table > tfoot > tr > td { + padding: 8px; + line-height: 1.42857143; + vertical-align: top; + border-top: 1px solid #ddd; +} +.table > thead > tr > th { + vertical-align: bottom; + border-bottom: 2px solid #ddd; +} +.table > caption + thead > tr:first-child > th, +.table > colgroup + thead > tr:first-child > th, +.table > thead:first-child > tr:first-child > th, +.table > caption + thead > tr:first-child > td, +.table > colgroup + thead > tr:first-child > td, +.table > thead:first-child > tr:first-child > td { + border-top: 0; +} +.table > tbody + tbody { + border-top: 2px solid #ddd; +} +.table .table { + background-color: #fff; +} +.table-condensed > thead > tr > th, +.table-condensed > tbody > tr > th, +.table-condensed > tfoot > tr > th, +.table-condensed > thead > tr > td, +.table-condensed > tbody > tr > td, +.table-condensed > tfoot > tr > td { + padding: 5px; +} +.table-bordered { + border: 1px solid #ddd; +} +.table-bordered > thead > tr > th, +.table-bordered > tbody > tr > th, +.table-bordered > tfoot > tr > th, +.table-bordered > thead > tr > td, +.table-bordered > tbody > tr > td, +.table-bordered > tfoot > tr > td { + border: 1px solid #ddd; +} +.table-bordered > thead > tr > th, +.table-bordered > thead > tr > td { + border-bottom-width: 2px; +} +.table-striped > tbody > tr:nth-child(odd) > td, +.table-striped > tbody > tr:nth-child(odd) > th { + background-color: #f9f9f9; +} +.table-hover > tbody > tr:hover > td, +.table-hover > tbody > tr:hover > th { + background-color: #f5f5f5; +} +table col[class*="col-"] { + position: static; + display: table-column; + float: none; +} +table td[class*="col-"], +table th[class*="col-"] { + position: static; + display: table-cell; + float: none; +} +.table > thead > tr > td.active, +.table > tbody > tr > td.active, +.table > tfoot > tr > td.active, +.table > thead > tr > th.active, +.table > tbody > tr > th.active, +.table > tfoot > tr > th.active, +.table > thead > tr.active > td, +.table > tbody > tr.active > td, +.table > tfoot > tr.active > td, +.table > thead > tr.active > th, +.table > tbody > tr.active > th, +.table > tfoot > tr.active > th { + background-color: #f5f5f5; +} +.table-hover > tbody > tr > td.active:hover, +.table-hover > tbody > tr > th.active:hover, +.table-hover > tbody > tr.active:hover > td, +.table-hover > tbody > tr.active:hover > th { + background-color: #e8e8e8; +} +.table > thead > tr > td.success, +.table > tbody > tr > td.success, +.table > tfoot > tr > td.success, +.table > thead > tr > th.success, +.table > tbody > tr > th.success, +.table > tfoot > tr > th.success, +.table > thead > tr.success > td, +.table > tbody > tr.success > td, +.table > tfoot > tr.success > td, +.table > thead > tr.success > th, +.table > tbody > tr.success > th, +.table > tfoot > tr.success > th { + background-color: #dff0d8; +} +.table-hover > tbody > tr > td.success:hover, +.table-hover > tbody > tr > th.success:hover, +.table-hover > tbody > tr.success:hover > td, +.table-hover > tbody > tr.success:hover > th { + background-color: #d0e9c6; +} +.table > thead > tr > td.info, +.table > tbody > tr > td.inf... [truncated message content] |
From: <txm...@us...> - 2015-03-04 12:35:33
|
Revision: 13007 http://sourceforge.net/p/xoops/svn/13007 Author: txmodxoops Date: 2015-03-04 12:35:29 +0000 (Wed, 04 Mar 2015) Log Message: ----------- Updated & added assets folder in default admin theme Modificed class/theme.php, added assets folder for admin system themes Modified Paths: -------------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/xoopsform/formtextdateselect.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_avatars.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_mailusers.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/default.php Added Paths: ----------- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/accordion.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/buttonbar.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/choosestyle.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dark.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/footer.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/forms.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/globalnav.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/icons.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/orange.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/pagenav.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/reset.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/silver.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/style.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tablesorter.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tabs.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/toolbar.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/tooltip.css XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/avatar.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/avatar_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/banners.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/banners_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/blocks.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/blocks_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/check.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/comments.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/comments_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/configuration.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/configuration_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/edituser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/edituser_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/filemanager.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/filemanager_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/finduser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/finduser_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/groups.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/groups_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/help.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/help_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/icon_options.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/icon_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/images.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/images_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/item.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/mailuser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/mailuser_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/maintenance.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/maintenance_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/modules.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/modules_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/newuser.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/prefs.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/prefs_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/smilies.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/smilies_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/tpls.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/tpls_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/userrank.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/userrank_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/icons/waiting.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/accordion.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/arrow-light-rtl.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/arrow-light.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/arrow-rtl.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/arrow.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/asc.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/bg.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/bg_tabs1.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/bg_tabs2.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/bgmenu.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/brightside.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/cp.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/dark/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/dark/dark-head.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/dark/dark-menu.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/dark/dark-navcp.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/dark/header-logo_big.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/dark/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/desc.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/feed.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/home.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/icon_big.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/icon_options.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/icon_small.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/left_both.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/logout.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/modules.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/orange/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/orange/dark-head.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/orange/dark-menu.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/orange/dark-navcp.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/orange/header-logo_big.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/orange/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/sflogo.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/silver/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/silver/bg_tabs1.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/silver/header-bg_big.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/silver/header-logo_big.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/silver/header.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/silver/header_over.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/silver/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/tweb.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/unsort.gif XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/xgiftshopbutton.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/img/xoops.png XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/formenu.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/menu.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/styleswitch.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/tabs.jquery.tools.min.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/js/tooltip.js XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/english/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/english/admin.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/english/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/english/localsupport.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/language/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/menu.php XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/theme.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/index.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_accordion.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_footer.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_globalnav.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_head.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_icons.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_metas.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_modules.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_page.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_scripts.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_tabs.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_toolbar.html XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/xotpl/xo_uptop.html Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/admin.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/admin.php (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/admin.php 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,142 @@ +<?php +/** + * XOOPS admin file + * + * You may not change or alter any portion of this comment or credits + * of supporting developers from this source code or any supporting source code + * which is considered copyrighted (c) material of the original comment or credit authors. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ + * @license GNU GPL 2 (http://www.gnu.org/licenses/old-licenses/gpl-2.0.html) + * @version $Id: admin.php 12033 2013-09-14 03:16:44Z beckmi $ + */ +$xoopsOption['pagetype'] = 'admin'; + +include dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mainfile.php'; +include_once $GLOBALS['xoops']->path('include/cp_functions.php'); +/** + * Admin Authentication + */ +if ($xoopsUser) { + if (!$xoopsUser->isAdmin(-1)) { + redirect_header('index.php', 2, _AD_NORIGHT); + exit(); + } +} else { + redirect_header('index.php', 2, _AD_NORIGHT); + exit(); +} + +xoops_cp_header(); +// ###### Output warn messages for security ###### +/** + * Error warning messages + */ +$admin_warnings_enable = false; +if (!isset($xoopsConfig['admin_warnings_enable']) || $xoopsConfig['admin_warnings_enable']) { + if (is_dir(XOOPS_ROOT_PATH . '/install/')) { + xoops_error(sprintf(_AD_WARNINGINSTALL, XOOPS_ROOT_PATH . '/install/')); + echo '<br />'; + $admin_warnings_enable = true; + } + + if (is_writable(XOOPS_ROOT_PATH . '/mainfile.php')) { + xoops_error(sprintf(_AD_WARNINGWRITEABLE, XOOPS_ROOT_PATH . '/mainfile.php')); + echo '<br />'; + $admin_warnings_enable = true; + } + // ###### Output warn messages for correct functionality ###### + if (! is_writable(XOOPS_CACHE_PATH)) { + xoops_error(sprintf(_AD_WARNINGNOTWRITEABLE, XOOPS_CACHE_PATH)); + echo '<br />'; + $admin_warnings_enable = true; + } + if (! is_writable(XOOPS_UPLOAD_PATH)) { + xoops_error(sprintf(_AD_WARNINGNOTWRITEABLE, XOOPS_UPLOAD_PATH)); + echo '<br />'; + $admin_warnings_enable = true; + } + if (! is_writable(XOOPS_COMPILE_PATH)) { + xoops_error(sprintf(_AD_WARNINGNOTWRITEABLE, XOOPS_COMPILE_PATH)); + echo '<br />'; + $admin_warnings_enable = true; + } + + //www fits inside www_private, lets add a trailing slash to make sure it doesn't + if (strpos(XOOPS_PATH . '/', XOOPS_ROOT_PATH . '/') !== false || strpos(XOOPS_PATH . '/', $_SERVER['DOCUMENT_ROOT'] . '/') !== false) { + xoops_error(sprintf(_AD_WARNINGXOOPSLIBINSIDE, XOOPS_PATH)); + echo '<br />'; + $admin_warnings_enable = true; + } + + if (strpos(XOOPS_VAR_PATH . '/', XOOPS_ROOT_PATH . '/') !== false || strpos(XOOPS_VAR_PATH . '/', $_SERVER['DOCUMENT_ROOT'] . '/') !== false) { + xoops_error(sprintf(_AD_WARNINGXOOPSLIBINSIDE, XOOPS_VAR_PATH)); + echo '<br />'; + $admin_warnings_enable = true; + } +} + +$GLOBALS['xoopsTpl']->assign ( 'admin_warnings_enable', $admin_warnings_enable ); + +if (!empty($_GET['xoopsorgnews'])) { + // Multiple feeds + $myts =& MyTextSanitizer::getInstance(); + $rssurl = array(); + $rssurl[] = 'http://sourceforge.net/export/rss2_projnews.php?group_id=41586&rss_fulltext=1'; + $rssurl[] = 'http://www.xoops.org/backend.php'; + if ($URLs = include $GLOBALS['xoops']->path('language/' . xoops_getConfigOption('language') . '/backend.php')) { + $rssurl = array_unique(array_merge($rssurl, $URLs)); + } + $rssfile = 'adminnews-' . xoops_getConfigOption('language'); + xoops_load('XoopsCache'); + $items = array(); + if (!$items = XoopsCache::read($rssfile)) { + require_once $GLOBALS['xoops']->path('class/snoopy.php'); + include_once $GLOBALS['xoops']->path('class/xml/rss/xmlrss2parser.php'); + + xoops_load('XoopsLocal'); + $snoopy = new Snoopy(); + $cnt = 0; + foreach ($rssurl as $url) { + if ($snoopy->fetch($url)) { + $rssdata = $snoopy->results; + $rss2parser = new XoopsXmlRss2Parser($rssdata); + if (false != $rss2parser->parse()) { + $_items = $rss2parser->getItems(); + $count = count($_items); + for ($i = 0; $i < $count; $i ++) { + $_items[$i]['title'] = XoopsLocal::convert_encoding($_items[$i]['title'], _CHARSET, 'UTF-8'); + $_items[$i]['description'] = XoopsLocal::convert_encoding($_items[$i]['description'], _CHARSET, 'UTF-8'); + $items[strval(strtotime($_items[$i]['pubdate'])) . "-" . strval(++$cnt)] = $_items[$i]; + } + } else { + echo $rss2parser->getErrors(); + } + } + } + krsort($items); + XoopsCache::write($rssfile, $items, 86400); + } + if ($items != '') { + $ret = '<table class="table table-bordered">'; + foreach(array_keys($items) as $i) { + $ret .= '<tr class="head"><td><a href="' . htmlspecialchars($items[$i]['link']) . '" rel="external">'; + $ret .= htmlspecialchars($items[$i]['title']) . '</a> (' . htmlspecialchars($items[$i]['pubdate']) . ')</td></tr>'; + if ($items[$i]['description'] != "") { + $ret .= '<tr><td class="odd">' . $items[$i]['description']; + if (! empty($items[$i]['guid'])) { + $ret .= ' <a href="' . htmlspecialchars($items[$i]['guid']) . '" rel="external" title="">' . _MORE . '</a>'; + } + $ret .= '</td></tr>'; + } else if ($items[$i]['guid'] != "") { + $ret .= '<tr><td class="even aligntop"></td><td colspan="2" class="odd"><a href="' . htmlspecialchars($items[$i]['guid']) . '" rel="external">' . _MORE . '</a></td></tr>'; + } + } + $ret .= '</table>'; + echo $ret; + } +} +xoops_cp_footer(); Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/xoopsform/formtextdateselect.php =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/xoopsform/formtextdateselect.php 2015-02-21 20:56:25 UTC (rev 13006) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/class/xoopsform/formtextdateselect.php 2015-03-04 12:35:29 UTC (rev 13007) @@ -60,7 +60,8 @@ $included = true; $GLOBALS['xoTheme']->addScript('','', ' $(function() { - $( ".datepicker" ).datepicker({ + $.datepicker.setDefaults( $.extend($.datepicker.regional["'. _LANGCODE .'"]) ); + $( "#datepicker-' . ucfirst($ele_name) . '" ).datepicker({ showOn: "button", buttonImage: "'.XOOPS_URL.'/images/calendar.png", buttonImageOnly: true, @@ -70,11 +71,11 @@ showButtonPanel: true, showOtherMonths: true, selectOtherMonths: true - }).regional[ "'. _LANGCODE .'" ]; + }) }); '); } } - return "<input type='text' name='" . $ele_name . "' id='" . $ele_name . "' class='datepicker' size='" . $this->getSize() . "' value='" . $display_value . "'" . $this->getExtra() . " />"; + return "<input type='text' name='" . $ele_name . "' class='form-control' id='datepicker-" . ucfirst($ele_name) . "' size='" . $this->getSize() . "' value=''" . $this->getExtra() . " />"; } } \ No newline at end of file Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_avatars.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_avatars.html 2015-02-21 20:56:25 UTC (rev 13006) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_avatars.html 2015-03-04 12:35:29 UTC (rev 13007) @@ -66,6 +66,6 @@ <{/if}> <!-- Display Avatar form (add,edit) --> <{if $form}> -<div class="spacer"><{$form}></div> +<div class="form-inline"><{$form}></div> <{/if}> <!-- Display Avatar images on edit page --> Modified: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_mailusers.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_mailusers.html 2015-02-21 20:56:25 UTC (rev 13006) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/templates/admin/system_mailusers.html 2015-03-04 12:35:29 UTC (rev 13007) @@ -3,7 +3,7 @@ <!-- Display mailusers form --> <br /> <{if $form}> - <div class="spacer"><{$form}></div> + <div class="form-inline"><{$form}></div> <{/if}> <{$Sucess}> <{$Errors}> \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/accordion.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/accordion.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/accordion.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,82 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ + +#accordion { + border:1px solid #f5f5f5; + background-color: #f0f0f0; + color: #333; + width: 100%; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; +} + +/* accordion header */ +#accordion h5 { + padding: 5px 10px; + cursor: pointer; + position: relative; + margin: 1px; + background: url(../img/accordion.png) repeat-x !important; + color: #fff; + border: 1px solid #FFF; + font-weight: bold; +} + +/* currently active header */ +#accordion h5.current { + cursor:default; + background-color: #f7f7f7; +} + +/* accordion pane */ +#accordion .pane { + display:none; + padding:10px; + font-size:12px; + line-height: 120%; +} + +.xgiftshop { + text-align: center !important; +} + +#xokeytitle { + padding: 2px; + font-size: 13px; + font-weight: bold; + color: #333; +} + +#xokeynumber { + text-align: center; + padding-top: 5px; + padding-bottom: 5px; + font-size: 13px; + font-weight: bold; + color: #92EF2C; +} + +#xolicenses { + padding: 5px 18px 5px 18px !important; +} + +#xolicenses a{ + color: #45C5DF; +} + +#xolicenses a:hover { + color: #FF0000; + text-decoration: none; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/buttonbar.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/buttonbar.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/buttonbar.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,96 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ + +#buttontop { + float: left !important; + width: 100% !important; + background: #DBD7D1 !important; + font-size: 93% !important; + line-height: normal !important; + border-top: 1px solid #666 !important; + border-left: 1px solid #666 !important; + border-right: 1px solid #666 !important; + margin: 0 !important; + -moz-border-radius-topleft: 5px; + -moz-border-radius-topright: 5px; + -webkit-border-top-left-radius: 5px; + -webkit-border-top-right-radius: 5px; + -khtml-border-top-left-radius: 5px; + -khtml-border-top-right-radius: 5px; + border-radius-topleft: 5px; + border-radius-topright: 5px; + line-height: normal !important; +} + +#buttonbar { + float: left !important; + width: 100% !important; + background: #DBD7D1 !important; + font-size: 93% !important; + line-height: normal !important; + border-left: 1px solid #666 !important; + border-right: 1px solid #666 !important; + border-bottom: 1px solid #666 !important; + margin-bottom: 12px !important; +} + +#buttonbar ul { + margin: 0 !important; + margin-top: 15px !important; + padding: 10px 10px 0 !important; + list-style: none !important; +} + +#buttonbar li { + display: inline !important; + margin: 0 !important; + padding: 0 !important; +} + +#buttonbar a { + float: left !important; + background: url('../img/bg_tabs1.gif') no-repeat 0% -34px !important; + margin: 0 !important; + padding: 0 0 0 9px !important; + text-decoration: none !important; + margin: 0 1px 0 0 !important; + text-decoration: none !important; +} + +#buttonbar a span { + float: none !important; + background: url('../img/bg_tabs2.gif') no-repeat 100% -34px !important; +} + +#buttonbar a:hover span { + color: #333 !important; +} + +#buttonbar #current a { + background-position: 0 0 !important; +} + +#buttonbar #current a span { + background-position: 100% 0px !important; + padding-bottom: 5px !important; + color: #23649F !important; +} + +#buttonbar a:hover { + background-position: 0 -69px !important; +} + +#buttonbar a:hover span { + background-position: 100% -69px !important; + color: #BC2A4D !important; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/choosestyle.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/choosestyle.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/choosestyle.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,43 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ + +#choosestyle a { + font-family: tahoma, Helvetica, sans-serif; + font-size: 10px; + border: 1px solid #ccc; + margin: 2px 4px 2px 4px; + float: right; + background-color: #f9f9f9; + color: #333; + padding: 3px; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + cursor: pointer; +} + +#choosestyle a:hover { + background-color: #C2CEEF; + color: #000; + text-decoration: none; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + cursor: pointer; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/content.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,289 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ +h1,h2,h3,h4,h5,h6 { + margin: 0; + line-height: 1.2; + font-weight: bold; + font-style: normal; +} + +h1 {font-size: 1.7em;} +h2 {font-size: 1.5em;} +h3 {font-size: 1.4em;} +h4 {font-size: 1.2em;} +h5 {font-size: 1em;} +h6 {font-size: .8em;} + +h1 { + clear: both; + background-color: transparent; + padding-left: .25em; + margin-bottom: 1em; +} + +h1 a,h2 a { + background-color: transparent; + text-decoration: none; +} + +h1 a:hover,h2 a:hover,h1 a:focus,h2 a:focus,h1 a:active,h2 a:active { + background-color: transparent; + text-decoration: underline; + outline: none; +} + +h2, h3 { + background-color: transparent; + margin-bottom: .5em; +} + +/* ==================== Style for images ==================== */ +img { + border: 0 !important; +} + +img.xo-icons { + margin-bottom: -3px; +} + +p img { + margin-left: .5em; + margin-right: .5em; +} + +a img:hover,a img:focus { + opacity: .5; + filter: alpha(opacity = 50); +} + +a img { + border: none; +} + +.imgsmile { + padding: 0 !important; + border: 0 !important; + margin-bottom: -2px !important; +} + +img.xo-icons { + margin-bottom: -3px; +} + +img.ui-datepicker-trigger { + margin: 3px; +} + +/*================ Style for Quotes ================*/ +blockquote { + display: block; + width: 95%; + margin-right: 2em; + background-color: #FAFAFA; + padding: .5em; + color: #444; + line-height: 125%; + font-size: 11px; + text-align: justify; + border: 1px dashed #c2cdd6; +} + +.xoopsQuote { + +} + +q,cite { + font-style: italic; +} + +q cite,q q { + font-style: normal; +} + +/* delete auto dobble quotes */ +q { + quotes: none; +} + +q:before,q:after { + content: ""; /* for Safari/Chrome */ +} + +/*================== Style for Codes =================*/ +.xoopsCode { + display: block; + width: 95%; + max-height: 400px; + overflow: auto; + margin: .5em; + padding: .5em; + border-width: 1px 1px 1px 3px; + border-color: #c2cdd6; + border-style: solid; +} + +code { +} + +code,pre { + white-space: -pre-wrap /* for opera */; + white-space: pre-wrap; + word-wrap : break-word; +} + +/* ==================== Links for Quotes ==================== */ +.xoopsQuote a:link,.xoopsQuote a:visited { + color: #444; + font-weight: bold; + background-color: transparent; +} + +.xoopsQuote a:hover,.xoopsQuote a:active { + color: #1778cb; + background-color: transparent; +} + +/* ==================== Redirect messages ==================== */ +.errorMsg { + background: #FBE3E4; + color: #D12F19; + text-align: center; + border: 2px solid #FBC2C4; + padding: 8px; + font-weight: bold; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + line-height: 140%; +} + +.confirmMsg { + background-color: #f3f3f3 !important; + color: #262F2E !important; + text-align: center; + border: 2px solid #ccc !important; + font-weight: bold; + width: 60%; + min-height: 120px !important; + margin: 80px auto; + padding: 8px; + padding-top: 30px !important; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + -khtml-border-radius: 6px; + border-radius: 6px; + line-height: 190%; +} + +/* ==================== For redirect pages ====================*/ +.message,.notreload { + text-align: center; +} + +/* ==================== General small ==================== */ +.fontSmall { + font-size: 10px; + background-color: transparent; +} + +a.fontSmall { + color: #006699; +} + +a.fontSmall:hover { + color: #C23030; + text-decoration: underline; +} + +/*=============== styles for tables =================*/ +table { + margin: 0; + width: 100%; + border: none; + border-collapse: separate /*collapse*/; + border-spacing: 1px; +} + +th { + background-color: #2e323b; + color: #fff; + padding: 4px; + vertical-align: middle; +} + +.outer { + width: 99%; + border: 2px solid #ccc; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + -khtml-border-radius: 3px; + border-radius: 3px; + margin: 5px; +} + +.head { + background-color: #AFAFAF; + padding: 5px; + font-weight: bold; +} + +.even { + background-color: #EFEFEF; + padding: 5px; + border-bottom: 1px solid #ccc; +} + +.odd { + background-color: #DFDFDF; + padding: 5px; + border-bottom: 1px solid #ccc; +} + +.foot { + background-color: #E1E7EF; + padding: 5px; + font-weight: bold; +} + +tr.head td { + background-color: #BDE3FB; + padding: 5px; + font-weight: bold; +} + +tr.even td { + background-color: #fff; + padding: 5px; + border-bottom: 1px solid #ccc; +} + +tr.odd td { + background-color: #EFEFEF; + padding: 5px; + border-bottom: 1px solid #ccc; +} + +tr.foot td { + background-color: #E1E7EF; + padding: 5px; + font-weight: bold; +} + +td.head {max-width: 300px !important;} +/*============= XOOPS Editors =============*/ +body.mceContentBody { + background-color: #fff; + background-image: none; + color: #333; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dark.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dark.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dark.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,128 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ +body { + background-color: #EBE9E1; +} + +.outer { + border: 2px solid #CCCCCC; +} + +.head { + background-color: #AFAFAF; +} + +.even { + background-color: #EFEFEF; +} + +.odd { + background-color: #DFDFDF; +} + +#xo-logo-head { + background: url(../img/dark/dark-head.png) repeat-x; + border-bottom: 1px solid #000; +} + +#xo_globalnav { + background: url(../img/dark/dark-menu.png) repeat-x; + border-top: 1px solid #000; + border-bottom: 1px solid #ccc; +} + +#xo_globalnav ul.menu ul li a { + background: #5F5F5F; + color: #f7f7f7; +} + +#xo_globalnav ul.menu ul li a:hover { + background-color: #333; + color: #f7f7f7; +} + +#xo_globalnav ul.menu .menulink { + border: 1px solid #333; + color: #ccc; + background: url(../img/dark/dark-menu.png) repeat-x; +} + +#xo_globalnav ul.menu .menulink:hover,ul.menu .menuhover { + border: 1px solid #ccc; + background: #333; +} + +#xo_globalnav ul.menu .sub { + background: #5F5F5F url(../img/arrow-light.gif) 156px 8px no-repeat; +} + +#choosestyle a { + border: 1px solid #CCCCCC; + background-color: #f9f9f9; + color: #333; +} + +#xo-body { + background-color: #F7F7F7; + border: 2px solid #ccc; +} + +#xo-nav-options { + background: url(../img/dark/dark-navcp.png) repeat-x; + border-top: 1px solid #000; + border-bottom: 1px solid #000; +} + +#xo-nav-options a { + border: 1px solid #00536C; +} + +#xo-nav-options a:hover { + background-color: #E0E6EF; + border-color: #ADD8E6; +} + +#xo-nav-options .modname { + color: #1d1f24; +} + +#xo-footer { + background-color: #333; + color: #f7f7f7; +} + +#xo-icon a { + background-color: #f0f0f0; + color: #666666; + border: 1px solid #f9f9f9; +} + +#xo-module-icons a { + background-color: #f0f0f0; + color: #666666; + border: 1px solid #f9f9f9; +} + +#xo-icon a:hover,#xo-module-icons a:hover { + color: #1E90FF; + border-left: 1px solid #eee; + border-top: 1px solid #eee; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + background: #f9f9f9; +} + +#main-logo a { + background: url(../img/dark/header-logo_big.png) no-repeat !important + ; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/dashboard.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,99 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ + +#xo-body-contain { + padding: 0; + margin: 0; +} + +#xo-body { + margin: 0 auto; + background-color: #F7F7F7; + border: 2px solid #ccc; + padding: 8px; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + -khtml-border-radius: 6px; + border-radius: 6px; + margin: 20px !important; +} + +#xo-index { + width: 100%; + border: 0; + min-height: 200px; + clear: both; +} + +#xo-index-bottom { + width: 100%; + border: 0; + clear: both; +} + +#xo-body-icons { + width: 66%; + float: left; +} + +#xo-tabs { + width: 32%; + float: right; +} + +#xo-modules { + width: 66%; + float: left; +} + +#xo-accordion { + width: 32%; + float: right; +} + +#xo-content { + clear: both; +} + +.xo-title { + font-size: 12px; + color: #606060; + background-position: left top; + background-repeat: no-repeat; + font-weight: bold; + height: 30px; + vertical-align: middle; + padding: 10px 40px 0 40px; + border-bottom: 3px solid #393e41; + font-weight: bold; + margin-bottom: 10px; +} + +#xo-title-modules { + background-image: url(../img/modules.png); +} + +#xo-title-icons { + background-image: url(../img/cp.png); +} + +#xo-title-accordion { + background-image: url(../img/brightside.png); +} + +.xo-index-option { + padding: 4px; + vertical-align: top; +} +#xo-module-log {text-align: center;} +.logger {margin: 1em auto !important; text-align: left;} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/footer.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/footer.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/footer.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,48 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ + +#xo-footer { + padding: 10px; + background-color: #333; + background: -moz-linear-gradient(center bottom, rgb(79,74,74) 0%, rgb(51,51,51) 100%); + background: -webkit-gradient(linear, left bottom, left top, color-stop(0, rgb(79,74,74)), color-stop(1, rgb(51,51,51))); + background: -khtml-gradient(linear, left bottom, left top, color-stop(0, rgb(79,74,74)), color-stop(1, rgb(51,51,51))); + border-top: 2px solid #afafaf; + text-align: center; + font-size: 10px; + font-weight: bold; + color: #f7f7f7; + height: 65px; +} + +#xo-footer a { color: #D5AE14; background-color: transparent;} + +#xo-footer a:hover { color: #f7f7f7; text-decoration: none; background-color: transparent;} + +#xo-footer-body { height: 20px; margin: 10px auto; width: 500px;} + +#xo-footer-rss { + display: block; + float: left; + margin-left: 50px; + margin-top: -40px; + text-align: left; +} + +#xo-uptop { + display: block; + float: right; + margin-right: 50px; + margin-top: -30px; + text-align: right; +} Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/forms.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/forms.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/forms.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,129 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ /*======= forms ========*/ +input,button,select { + vertical-align: middle; +} + +fieldset { + margin: .5em; + padding: 1em; + border: 1px solid #333; + color: #000; + background-color: #f0f0f0; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + -khtml-border-radius: 6px; + border-radius: 6px; +} + +legend { + padding: .5em; + font-size: 1.1em; + font-weight: bolder; +} + +label,.caption-text { + margin-bottom: .5em; + padding-right: .5em; + font-weight: bold; +} + +select { + background-color: #f7f7f7; + color: #333; + font-size: 1em; + border: 2px inset #f1f3f8 !important; +} + +select[name=timezone_offset] { + font-size: 1em; +} + +textarea { + width: 95%; + max-height: 300px; + overflow: auto; +} + +input[type=submit],input[type=reset],input[type=button],.xo-formbuttons,.formButton,button + { + margin: 2px 5px 2px 5px; + background-color: #D3D2D6; + padding: 4px 8px; + color: #405A80; + font-size: 1em; + font-weight: bold; + border: 1px solid #ccc; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + cursor: pointer; +} + +input[type=submit]:hover,input[type=reset]:hover,input[type=button]:hover,.xo-formbuttons:hover,.formButton:hover,button:hover + { + background-color: #E6EBFF; + padding: 4px 8px; + color: inherit; + cursor: pointer; +} + +input[type=text],input[type=password],input[type=checkbox],input[type=file],textarea + { + border: 1px solid #ccc; + margin: 2px 5px 2px 0; + padding: 2px; + background-color: #f7f7f7; + padding-left: .2em; + color: inherit; + border: #ccc solid 1px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -khtml-border-radius: 5px; + border-radius: 5px; + +} + +input[type=text],input[type=password],input[type=file] { + background-color: #f7f7f7; + color: #333; +} + +input[type=text]:hover,input[type=password]:hover,input[type=file]:hover,input[type=checkbox]:hover,textarea:hover + { + background-color: #EFEFEF; + color: inherit; + border: 1px solid #E9CB38; +} + +input[type=text]:focus,input[type=password]:focus,input[type=file]:focus,input[type=checkbox]:focus,textarea:focus + { + background-color: #F4FAFF; + color: #333; + border: #139EE8 solid 1px; + outline: 1px solid #139EE8; + -moz-outline-radius: 5px; + -webkit-outline-radius: 5px; + -khtml-outline-radius: 5px; + border-outline: 5px; +} + +input[type=checkbox],input[type=radio] { + margin: 3px; + padding: 2px; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/globalnav.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/globalnav.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/globalnav.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,109 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ + + +#xo_globalnav { + background: url(../img/dark/dark-menu.png) repeat-x; + /*padding: 4px;*/ + border-top: 1px solid #000; + border-bottom: 1px solid #ccc; + font-weight: normal; + font-family: tahoma, Helvetica, sans-serif; + height: 28px; + list-style: none; +} + +#xo_globalnav ul.menu { + list-style: none; + margin: 0; + padding: 0; +} + +#xo_globalnav ul.menu * { + margin: 0; + padding: 0; +} + +#xo_globalnav ul.menu a { + display: block; + color: #1F1F1F; + text-decoration: none; +} + +#xo_globalnav ul.menu li { + position: relative; + float: left; + margin-right: 2px; + list-style: none; +} + +#xo_globalnav ul.menu ul { + position: absolute; + /*top: 26px;*/ /*deactivate test and fix */ + left: 0; + background: #d1d1d1; + display: none; + opacity: 0; +} + +#xo_globalnav ul.menu ul li { + position: relative; + border: 1px solid #aaa; + border-top: none; + width: 168px; + margin: 0; + list-style: none; +} + +#xo_globalnav ul.menu ul li a { + display: block; + padding: 3px 7px 5px; + background: #5F5F5F; + color: #f7f7f7; + /*background: #ddd no-repeat left; + padding-left: 20px;*/ +} + +#xo_globalnav ul.menu ul li a:hover { + background-color: #333; + color: #f7f7f7; +} + +#xo_globalnav ul.menu ul ul { + left: 168px; + top: -1px; + list-style: none; +} + +#xo_globalnav ul.menu .menulink { + border: 1px solid #333; + padding: 5px 7px 4px; + font-weight: bold; + color: #ccc; + background: url(../img/dark/dark-menu.png) repeat-x; + width: 154px; +} + +#xo_globalnav ul.menu .menulink:hover,ul.menu .menuhover { + border: 1px solid #ccc; + background: #333; +} + +#xo_globalnav ul.menu .sub { + background: #5F5F5F url(../img/arrow.gif) 156px 8px no-repeat; + /*padding-left: 3px;*/ +} + +#xo_globalnav ul.menu .topline { + border-top: 1px solid #aaa; +} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/icons.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/icons.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/icons.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,120 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ + +#xo-system-icons { + height: 200px; +} + +#xo-module-icons,#xo-icon { + margin: 3px; + font-family: tahoma, Helvetica, sans-serif; + text-align: center; +} + +#xo-module-icons { + min-height: 250px; +} + +#xo-icon a { + display: block; + float: left; + height: 75px !important; + width: 70px !important; + vertical-align: middle; + text-decoration: none; + background-color: #f0f0f0; + padding: 2px; + margin: 3px; + color: #666666; + border: 1px solid #f9f9f9; + -moz-border-radius: 9px; + -webkit-border-radius: 9px; + -khtml-border-radius: 9px; + border-radius: 9px; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; +} + +#xo-module-icons a { + display: block; + float: left; + height: 80px !important; + width: 80px !important; + vertical-align: middle; + text-decoration: none; + background-color: #f0f0f0; + padding: 2px 5px 1px 5px; + margin: 3px; + color: #666666; + border: 1px solid #f9f9f9; + -moz-border-radius: 6px; + -webkit-border-radius: 6px; + -khtml-border-radius: 6px; + border-radius: 6px; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; +} + +#xo-icon a:hover,#xo-module-icons a:hover { + color: #1E90FF; + border-left: 1px solid #eee; + border-top: 1px solid #eee; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + background: #f9f9f9; + filter: alpha(opacity = 80); + -moz-opacity: 0.8; + -webkit-opacity: 0.8; + -khtml-opacity: 0.8; + opacity: 0.8; + box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -moz-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -webkit-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; + -khtml-box-shadow: 0 20px 10px -10px rgba(255, 255, 255, 0.3) inset; +} + +#xo-icon img{ + margin-top: 8px; + margin-bottom: 8px; +} + +#xo-module-icons img { + margin-top: 8px; + margin-bottom: 8px; + max-width: 70px !important; +} + +#xo-icon span,#xo-module-icons span { + font-size: 10px; + font-weight: bold; + display: block; +} + +#xo-icon span.uno,#xo-module-icons span.uno { + font-size: 11px; + font-weight: normal; + text-decoration: underline; + color: Blue; +} + +#xo-icon span.unor,#xo-module-icons span.unor { + font-size: 11px; + font-weight: normal; + text-decoration: underline; + color: #CC0000; +} + Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/index.html =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/index.html (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/index.html 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1 @@ + <script>history.go(-1);</script> \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/logger.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,35 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ +#xo-logger-errors, #xo-logger-deprecated, #xo-logger-queries, #xo-logger-blocks, +#xo-logger-extra, #xo-logger-timers{ + max-width: 95% !important; +} +#xo-logger-output { + margin: 0 auto !important; +} +#xo-logger-tabs { + background-color: #4E4949; + padding-top: 8px; + padding-bottom: 8px; + margin-top: -2px; + padding-left: 2%; + padding-right: 2%; + width: 96% !important; + +} +#xo-logger-errors {} +#xo-logger-deprecated {} +#xo-logger-queries {} +#xo-logger-blocks {} +#xo-logger-extra {} +#xo-logger-timers {} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/orange.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/orange.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/orange.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,129 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ +body { + background-color: #EBE7E1; +} + +.outer { + border: 2px solid #CCCCCC; +} + +.head { + background-color: #AFAFAF; +} + +.even { + background-color: #EFEFEF; +} + +.odd { + background-color: #DFDFDF; +} + +#xo-logo-head { + background: url(../img/orange/dark-head.png) repeat-x; + border-bottom: 1px solid #000; +} + +#xo_globalnav { + background: url(../img/orange/dark-menu.png) repeat-x; + border-top: 1px solid #000; + border-bottom: 1px solid #ccc; +} + +#xo_globalnav ul.menu ul li a { + background: #5F5F5F; + color: #f7f7f7; +} + +#xo_globalnav ul.menu ul li a:hover { + background-color: #333; + color: #f7f7f7; +} + +#xo_globalnav ul.menu .menulink { + border: 1px solid #333; + color: #ccc; + background: url(../img/orange/dark-menu.png) repeat-x; +} + +#xo_globalnav ul.menu :hover .menulink,ul.menu .menuhover { + border: 1px solid #ccc; + background: #333; +} + +#xo_globalnav ul.menu .sub { + background: #5F5F5F url(../img/arrow-light.gif) 136px 8px no-repeat; +} + +#choosestyle a { + border: 1px solid #CCCCCC; + background-color: #f9f9f9; + color: #333; +} + +#xo-body{ + background-color: #F7F7F7; + border: 2px solid #ccc; +} + +#xo-nav-options { + background: url(../img/orange/dark-navcp.png) repeat-x; + border-top: 1px solid #f9a828; + border-bottom: 1px solid #f9a828; +} + +#xo-nav-options a { + border: 1px solid #FFB24F; +} + +#xo-nav-options a:hover { + background-color: #E0E6EF; + border-color: #ADD8E6; +} + +#xo-nav-options .modname { + color: #1d1f24; +} + +#xo-footer { + background-color: #333; + color: #f7f7f7; +} + +#xo-icon a { + background-color: #f0f0f0; + color: #666666; + border: 1px solid #f9f9f9; +} + +#xo-module-icons a { + background-color: #f0f0f0; + color: #666666; + border: 1px solid #f9f9f9; +} + +#xo-icon a:hover,#xo-module-icons a:hover { + color: #1E90FF; + border-left: 1px solid #eee; + border-top: 1px solid #eee; + border-right: 1px solid #ccc; + border-bottom: 1px solid #ccc; + background: #f9f9f9; +} + +#main-logo a { + background: url(../img/orange/header-logo_big.png) no-repeat + !important; +} +#xo-modname { color: #FBFBFB;} \ No newline at end of file Added: XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/pagenav.css =================================================================== --- XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/pagenav.css (rev 0) +++ XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs/modules/system/themes/default/assets/css/pagenav.css 2015-03-04 12:35:29 UTC (rev 13007) @@ -0,0 +1,78 @@ +/* + * Default Admin Theme + * + * @copyright Xoops Project <http://www.xoops.org/> + * @license http://www.fsf.org/copyleft/gpl.html GNU public license 3.0 + * @package themes + * @since 2.5.x + * @author Xoops Design Theme <http://www.xoops.org/> + * @maintained Xoops Design Theme <http://www.xoops.org/> + * + * @version $Id +*/ +#xo-pagenav { + margin: 7px 0; + text-align: center; + font-size: 1.05em; +} + +#xo-pagenav a { + margin: 2px; + background-color: #D3D2D6; + padding: 4px 8px 4px 8px; + color: #405A80; + font-size: 1em; + font-weight: bold; + border: 1px solid #ccc; +... [truncated message content] |
From: <zy...@us...> - 2015-02-21 20:56:28
|
Revision: 13006 http://sourceforge.net/p/xoops/svn/13006 Author: zyspec Date: 2015-02-21 20:56:25 +0000 (Sat, 21 Feb 2015) Log Message: ----------- * require XOOPS 2.5.7+ & PHP 5.3.7+ * renamed all template extensions from .html to .tpl * added XOOPS & PHP version checks on install/update * moved install/uninstall/upgrade functions to ./include/action.module.php * moved images and css directories to ./assets * added loading stylesheet in block * added XoopspartnersConstants class for constant definitions * added block config to be able to trim title length * added _MI_XPARTNERS_INCADMIN define, missing in previous BETA * refactored /admin/main.php from seperate functions to switch statement * general code cleanup for PSRx Modified Paths: -------------- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/about.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_footer.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_header.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/index.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/main.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/menu.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/blocks/partners.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/class/partners.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/docs/changelog.txt XoopsModules/xoopspartners/branches/zyspec/xoopspartners/docs/install.txt XoopsModules/xoopspartners/branches/zyspec/xoopspartners/docs/readme.txt XoopsModules/xoopspartners/branches/zyspec/xoopspartners/footer.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/header.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/index.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/join.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/english/admin.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/english/blocks.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/english/main.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/english/modinfo.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/french/admin.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/french/blocks.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/french/modinfo.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/spanish/admin.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/spanish/blocks.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/language/spanish/modinfo.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/test/readme.txt XoopsModules/xoopspartners/branches/zyspec/xoopspartners/vpartner.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/xoops_version.php Added Paths: ----------- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/assets/ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/assets/css/ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/assets/css/style.css XoopsModules/xoopspartners/branches/zyspec/xoopspartners/assets/images/ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/assets/index.html XoopsModules/xoopspartners/branches/zyspec/xoopspartners/class/constants.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/include/ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/include/action.module.php XoopsModules/xoopspartners/branches/zyspec/xoopspartners/include/index.html XoopsModules/xoopspartners/branches/zyspec/xoopspartners/templates/blocks/xoopspartners_block_site.tpl XoopsModules/xoopspartners/branches/zyspec/xoopspartners/templates/xoopspartners_index.tpl XoopsModules/xoopspartners/branches/zyspec/xoopspartners/templates/xoopspartners_join.tpl Removed Paths: ------------- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/css/ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/images/ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/templates/blocks/xoopspartners_block_site.html XoopsModules/xoopspartners/branches/zyspec/xoopspartners/templates/xoopspartners_index.html XoopsModules/xoopspartners/branches/zyspec/xoopspartners/templates/xoopspartners_join.html Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/about.php =================================================================== --- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/about.php 2015-02-20 09:09:25 UTC (rev 13005) +++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/about.php 2015-02-21 20:56:25 UTC (rev 13006) @@ -1,5 +1,5 @@ <?php -/** +/* * XoopsPartners module * * You may not change or alter any portion of this comment or credits @@ -8,17 +8,19 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + */ +/** + * XoopsPartners - a partner affiliation links modulerequire __DIR__ . '/admin_header.php'; * - * @copyright:: The XOOPS Project (http://www.xoops.org) - * @license:: GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/) - * @package:: XoopsPartners + * @copyright:: {@link http://sourceforge.net/projects/xoops/ The XOOPS Project}$indexAdmin = new ModuleAdmin(); + * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license}$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); + * @package:: xoopspartners + * @author:: Mage, Mamba * @since:: 1.11 - * @author:: Mage, Mamba - * @version:: $Id $ - * + * @version:: $Id: $ */ -require 'admin_header.php'; +require __DIR__ . '/admin_header.php'; include '../../../class/xoopsformloader.php'; $aboutAdmin = new ModuleAdmin(); @@ -26,4 +28,4 @@ echo $aboutAdmin->addNavigation('about.php'); echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false); -include 'admin_footer.php'; \ No newline at end of file +include __DIR__ . '/admin_footer.php'; Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_footer.php =================================================================== --- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_footer.php 2015-02-20 09:09:25 UTC (rev 13005) +++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_footer.php 2015-02-21 20:56:25 UTC (rev 13006) @@ -1,5 +1,5 @@ <?php -/** +/* * XoopsPartner module * * You may not change or alter any portion of this comment or credits @@ -8,13 +8,14 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license - * @package:: XoopsPartners + */ +/** + * @copyright:: {@link http://sourceforge.net/projects/xoops/ The XOOPS Project} + * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license} + * @package:: xoopspartners * @since:: 1.11 * @author:: XOOPS Development Team - * @version: $Id $ + * @version: $Id: $ **/ if (!isset($moduleInfo) || !is_a($moduleInfo, 'XoopsModule')) { @@ -25,10 +26,10 @@ } echo "<div class='adminfooter'>\n" - ." <div style='text-align: center;'>\n" - ." <a href='" . $moduleInfo->getInfo('author_website_url') . "' target='_blank'><img src='" . XOOPS_URL . "/" . $moduleInfo->getInfo("dirmoduleadmin") . "/icons/32/xoopsmicrobutton.gif' alt='" . $xoopsModule->getInfo('author_website_name') . "' title='" . $moduleInfo->getInfo('author_website_name') . "' /></a>\n" + ." <div class='txtcenter'>\n" + ." <a href='" . $moduleInfo->getInfo('author_website_url') . "' target='_blank'><img src='" . $GLOBALS['xoops']->url("www/{$pathIcon32}/xoopsmicrobutton.gif") . "' alt='" . $xoopsModule->getInfo('author_website_name') . "' title='" . $moduleInfo->getInfo('author_website_name') . "' /></a>\n" ." </div>\n" ." " . _AM_XPARTNERS_ADMIN_FOOTER . "\n" - ."</div>"; + ."</div>\n"; -xoops_cp_footer(); \ No newline at end of file +xoops_cp_footer(); Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_header.php =================================================================== --- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_header.php 2015-02-20 09:09:25 UTC (rev 13005) +++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/admin_header.php 2015-02-21 20:56:25 UTC (rev 13006) @@ -1,5 +1,5 @@ <?php -/** +/* * XoopsPartners module * * You may not change or alter any portion of this comment or credits @@ -8,24 +8,29 @@ * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license - * @package:: XoopsPartners + */ +/** + * @copyright:: {@link http://sourceforge.net/projects/xoops/ The XOOPS Project} + * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license} + * @package:: xoopspartners * @subpackage:: admin * @since:: 1.11 * @author:: XOOPS Team - * @version:: $Id $ + * @version:: $Id: $ **/ -require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php'; -include_once XOOPS_ROOT_PATH . '/include/cp_functions.php'; -require XOOPS_ROOT_PATH . '/include/cp_header.php'; +require_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; +include_once $GLOBALS['xoops']->path('/include/cp_functions.php'); +require $GLOBALS['xoops']->path('/include/cp_header.php'); + +$moduleDirname = basename(dirname(__DIR__)); +xoops_load('constants', $moduleDirname); + //Load languages -$thisModDir = $xoopsModule->getVar('dirname', 'n'); -xoops_loadLanguage('admin', $thisModDir); -xoops_loadLanguage('modinfo', $thisModDir); -xoops_loadLanguage('main', $thisModDir); +$moduleDirname = $GLOBALS['xoopsModule']->getVar('dirname', 'n'); +xoops_loadLanguage('admin', $moduleDirname); +xoops_loadLanguage('modinfo', $moduleDirname); +xoops_loadLanguage('main', $moduleDirname); if ( file_exists($GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'))){ include_once $GLOBALS['xoops']->path('/Frameworks/moduleclasses/moduleadmin/moduleadmin.php'); @@ -35,15 +40,19 @@ //return false; } -$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid')); -$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); -$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); +$moduleHandler =& xoops_gethandler('module'); +$moduleInfo =& $moduleHandler->get($GLOBALS['xoopsModule']->getVar('mid')); +$pathIcon16 = $GLOBALS['xoopsModule']->getInfo('icons16'); +$pathIcon32 = $GLOBALS['xoopsModule']->getInfo('icons32'); +$pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin'); +//$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); +//$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32'); $myts =& MyTextSanitizer::getInstance(); -if (!isset($xoopsTpl) || !is_object($xoopsTpl)) { - include_once XOOPS_ROOT_PATH . "/class/template.php"; - $xoopsTpl = new XoopsTpl(); +if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) { + include_once $GLOBALS['xoops']->path("/class/template.php"); + $GLOBALS['xoopsTpl'] = new XoopsTpl(); } -xoops_cp_header(); \ No newline at end of file +xoops_cp_header(); Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/index.php =================================================================== --- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/index.php 2015-02-20 09:09:25 UTC (rev 13005) +++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/index.php 2015-02-21 20:56:25 UTC (rev 13006) @@ -1,45 +1,46 @@ <?php -// -// ------------------------------------------------------------------------ // -// XOOPS - PHP Content Management System // -// Copyright (c) 2000 XOOPS.org // -// <http://www.xoops.org/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -// Author: Raul Recio (AKA UNFOR) // -// Project: The XOOPS Project // -// ------------------------------------------------------------------------- // + +/*------------------------------------------------------------------------ + XOOPS - PHP Content Management System + Copyright (c) 2000 XOOPS.org + <http://www.xoops.org/> + ------------------------------------------------------------------------ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting + source code which is considered copyrighted (c) material of the + original comment or credit authors. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ------------------------------------------------------------------------ + Author: Raul Recio (AKA UNFOR) + Project: The XOOPS Project + ------------------------------------------------------------------------- + */ /** - * Xoops Headline Administration + * XoopsParnters Administration * - * @copyright:: The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license:: http://www.fsf.org/copyleft/gpl.html GNU public license - * @package:: xoopsheadline - * @since:: 1.11 + * @copyright:: {@link http://sourceforge.net/projects/xoops/ The XOOPS Project} + * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license} + * @package:: xoopspartners + * @since:: 1.11 * @author:: Raul Recio (aka UNFOR) * @version: $Id: $ */ -require 'admin_header.php'; -$indexAdmin = new ModuleAdmin(); +require __DIR__ . '/admin_header.php'; +$adminClass = new ModuleAdmin(); //----------------------- $xpPartnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname', 'n')); @@ -48,14 +49,14 @@ $totalNonActivePartners = $xpPartnerHandler->getCount(new Criteria('status', 0, '=')); $totalActivePartners = $totalPartners - $totalNonActivePartners; -$indexAdmin->addInfoBox(_MD_XPARTNERS_DASHBOARD); +$adminClass->addInfoBox(_MD_XPARTNERS_DASHBOARD); -$indexAdmin->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALACTIVE. "</infolabel>", $totalActivePartners, 'Green'); -$indexAdmin->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALNONACTIVE. "</infolabel>", $totalNonActivePartners, 'Red'); -$indexAdmin->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALPARTNERS. "</infolabel><infotext>", $totalPartners."</infotext>"); +$adminClass->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALACTIVE. "</infolabel>", $totalActivePartners, 'Green'); +$adminClass->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALNONACTIVE. "</infolabel>", $totalNonActivePartners, 'Red'); +$adminClass->addInfoBoxLine(_MD_XPARTNERS_DASHBOARD, "<infolabel>" ._MD_XPARTNERS_TOTALPARTNERS. "</infolabel><infotext>", $totalPartners."</infotext>"); //---------------------------- -echo $indexAdmin->addNavigation('index.php'); -echo $indexAdmin->renderIndex(); +echo $adminClass->addNavigation('index.php'); +echo $adminClass->renderIndex(); -include 'admin_footer.php'; \ No newline at end of file +include __DIR__ . '/admin_footer.php'; Modified: XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/main.php =================================================================== --- XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/main.php 2015-02-20 09:09:25 UTC (rev 13005) +++ XoopsModules/xoopspartners/branches/zyspec/xoopspartners/admin/main.php 2015-02-21 20:56:25 UTC (rev 13006) @@ -1,426 +1,363 @@ <?php -// $Id: main.php,v 1.9.4.2 2005/03/29 15:58:18 mithyt2 Exp $ -// ------------------------------------------------------------------------ // -// XOOPS - PHP Content Management System // -// Copyright (c) 2000 XOOPS.org // -// <http://www.xoops.org/> // -// ------------------------------------------------------------------------ // -// This program is free software; you can redistribute it and/or modify // -// it under the terms of the GNU General Public License as published by // -// the Free Software Foundation; either version 2 of the License, or // -// (at your option) any later version. // -// // -// You may not change or alter any portion of this comment or credits // -// of supporting developers from this source code or any supporting // -// source code which is considered copyrighted (c) material of the // -// original comment or credit authors. // -// // -// This program is distributed in the hope that it will be useful, // -// but WITHOUT ANY WARRANTY; without even the implied warranty of // -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // -// GNU General Public License for more details. // -// // -// You should have received a copy of the GNU General Public License // -// along with this program; if not, write to the Free Software // -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// ------------------------------------------------------------------------ // -// Author: Raul Recio (AKA UNFOR) // -// Project: The XOOPS Project // -// ------------------------------------------------------------------------- // +/* + ------------------------------------------------------------------------ + XOOPS - PHP Content Management System + Copyright (c) 2000 XOOPS.org + <http://www.xoops.org/> + ------------------------------------------------------------------------ + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. -require 'admin_header.php'; + You may not change or alter any portion of this comment or credits + of supporting developers from this source code or any supporting + source code which is considered copyrighted (c) material of the + original comment or credit authors. -$indexAdmin = new ModuleAdmin(); -$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16'); + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -$del = 0; + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + ------------------------------------------------------------------------ + Author: Raul Recio (AKA UNFOR) + Project: The XOOPS Project + ------------------------------------------------------------------------- +*/ +/** + * XoopsPartners - a partner affiliation links module + * + * @copyright:: {@link http://sourceforge.net/projects/xoops/ The XOOPS Project} + * @license:: {@link http://www.fsf.org/copyleft/gpl.html GNU public license} + * @package:: xoopspartners + * @author:: Raul Recio (aka unfor) + * @version:: $Id: $ + */ +require __DIR__ . '/admin_header.php'; +$adminClass = new ModuleAdmin(); +$pathImageIcon = $GLOBALS['xoops']->url('www/'. $moduleInfo->getInfo('icons16')); -function partnersAdmin() -{ - global $xoopsModule, $indexAdmin, $pathImageIcon; - $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection(); -// $xoopsDB =& Database::getInstance(); - $myts =& MyTextSanitizer::getInstance(); - $xpPartnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname')); +$myts =& MyTextSanitizer::getInstance(); - echo $indexAdmin->addNavigation('main.php?op=default'); - echo" <form action='main.php' method='post' name='reorderform'>\n" - . " <table style='width: 100%; border-width: 0px; margin: 1px; padding: 0px;' class='outer'>\n" - . " <tr>\n" . " <th style='width: 20%; text-align: center;'>" . _AM_XPARTNERS_TITLE . "</th>\n" - . " <th style='width: 3%; text-align: center;'>" . _AM_XPARTNERS_IMAGE . "</th>\n" . " <th>" - . _AM_XPARTNERS_DESCRIPTION . "</th>\n" . " <th style='width: 3%; text-align: center;'>" - . _AM_XPARTNERS_ACTIVE . "</th>\n" . " <th style='width: 3%; text-align: center;'>" - . _AM_XPARTNERS_WEIGHT . "</th>\n" . " <th style='width: 3%; text-align: center;'>" . _AM_XPARTNERS_HITS - . "</th>\n" . " <th style='width: 3%; text-align: center;'>" . _AM_XPARTNERS_ACTIONS . "</th>\n" - . " </tr>\n"; +xoops_load('XoopsRequest'); +$op = XoopsRequest::getCmd('op', ''); +$id = XoopsRequest::getInt('id', 0); - $criteria = new CriteriaCompo(); - $criteria->setSort('status DESC, weight ASC, title'); - $criteria->setOrder('DESC'); - $partnerObjs = $xpPartnerHandler->getAll($criteria); - $class = 'even'; - foreach ($partnerObjs as $partnerObj) { - $url = formatURL($myts->htmlSpecialChars($partnerObj->getVar('url'))); - $image = formatURL($myts->htmlSpecialChars($partnerObj->getVar('image'))); - $title = $myts->htmlSpecialChars($partnerObj->getVar('title')); - $description = $myts->htmlSpecialChars($partnerObj->getVar('description')); - $imageInfo = @getimagesize($partnerObj->getVar('image')); - /* - $result = $xoopsDB->query("SELECT id, hits, url, weight, image, title, description, status FROM ".$xoopsDB->prefix("partners")." ORDER BY status DESC, weight ASC, title DESC"); - $class = 'even'; - while (list($id, $hits, $url, $weight, $image, $title, $description, $status) = $xoopsDB->fetchrow($result)) { - $url = formatURL($myts->htmlSpecialChars($url)); - $image = formatURL($myts->htmlSpecialChars($image)); - $title = $myts->htmlSpecialChars($title); - $description = $myts->htmlSpecialChars($description); - */ - if ($imageInfo = getimagesize($image)) { - $imageWidth = $imageInfo[0]; - $imageHeight = $imageInfo[1]; - $errorMsg = ($imageWidth >= 150 || $imageHeight >= 110) ? "<br />" . _AM_XPARTNERS_IMAGE_ERROR : ''; - } else { - $imageWidth = 150; - $imageHeight = 110; - } - $check1 = $check2 = ""; - if (1 == $partnerObj->getVar('status')) { - $check1 = " selected='selected'"; - } else { - $check2 = " selected='selected'"; - } - echo" <tr>\n" - . " <td class='{$class}' style='width: 20%; text-align: center; vertical-align: middle;'><a href='{$url}' rel='external'>{$title}</a></td>\n" - . " <td class='{$class}' style='width: 3%; text-align: center;'>"; - if (!empty($image)) { - echo "<img src='{$image}' alt='{$title}' style='width: " . intval(.65 * $imageWidth) . "px; height: " . intval(.65 * $imageHeight) . "px;' />{$errorMsg}"; - } else { - echo " "; - } +$del = isset($_POST['del']) ? XoopsRequest::getInt('del', XoopspartnersConstants::CONFIRM_NOT_OK, 'POST') : null; +$hits = isset($_POST['hits']) ? XoopsRequest::getint('hits', 0, 'POST') : null; +$url = isset($_POST['url']) ? XoopsRequest::getString('url', '', 'POST') : null; +$image = isset($_POST['image']) ? XoopsRequest::getText('image', '', 'POST') : null; +$title = isset($_POST['title']) ? XoopsRequest::getString('title', '', 'POST') : null; +$description = isset($_POST['description']) ? XoopsRequest::getText('description', '', 'POST') : null; +$status = isset($_POST['status']) ? XoopsRequest::getInt('status', array(), 'POST') : null; - echo" </td>\n" . " <td class='{$class}'>{$description}</td>\n" - . " <td class='{$class}' style='width: 3%px; text-align: center;'>\n" - . " <select style='size: 1px;' name='status[" . $partnerObj->getVar('id') - . "]'> <option value='1'{$check1}>" . _YES . "</option><option value='0'{$check2}>" . _NO - . "</option></select>\n" . " <td class='{$class}' style='width: 3%; text-align: center;'>\n" - . " <input type='text' name='weight[" . $partnerObj->getVar('id') . "]' value='" - . $partnerObj->getVar( - 'weight' - ) . "' style='size: 3px; text-align: center;' maxlength='3' />\n" . " </td>\n" - . " <td class='{$class}' style='width: 3%; text-align: center;'>" . $partnerObj->getVar('hits') . "</td>\n" - . " <td class='{$class}' style='width: 3%; text-align: center;'>\n" +switch ($op) { - . " <a href='main.php?op=editPartner&id=" . $partnerObj->getVar('id') - . "'><img src='{$pathImageIcon}/edit.png' alt='" . _EDIT . "' title='" . _EDIT . "' /></a>\n" + case 'partnersAdmin': + default: + $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname')); - . " <a href='main.php?op=delPartner&id=" . $partnerObj->getVar('id') - . "'><img src='{$pathImageIcon}/delete.png' alt='" . _DELETE . "' title='" . _DELETE . "' /></a>\n" - . " </td>\n" . " </tr>\n"; - $class = ($class == 'odd') ? 'even' : 'odd'; - } - unset($partnerObjs); - echo" <tr>\n" . " <td class='foot' colspan='7' style='text-align: right;'>\n" - . " <input type='hidden' name='op' value='reorderPartners' />\n" - . " <input type='button' name='button' onclick=\"location='main.php?op=partnersAdminAdd'\" value='" - . _AM_XPARTNERS_ADD . "' />\n" - . " <input type='button' name='button' onclick=\"location='main.php?op=reorderAutoPartners'\" value='" - . _AM_XPARTNERS_AUTOMATIC_SORT . "' />\n" . " <input type='submit' name='submit' value='" - . _AM_XPARTNERS_REORDER . "' />\n" . " </td>\n" . " </tr>\n" . " </table>\n" . " </form>\n"; - include 'admin_footer.php'; -} + echo $adminClass->addNavigation('main.php'); + $adminClass->addItemButton(_AM_XPARTNERS_ADD, 'main.php' . '?op=partnersAdminAdd', $icon = 'add'); + echo $adminClass->renderButton(); -function reorderPartners($weight=array(), $status=0) -{ - global $xoopsModule, $xoopsDB; + echo " <form action='main.php' method='post' name='reorderform'>\n" + . " <table style='margin: 1px; padding: 0px;' class='outer width100 bnone'>\n" + . " <thead>\n" + . " <tr>\n" + . " <th class='txtcenter width20'>" . _AM_XPARTNERS_TITLE . "</th>\n" + . " <th style='width: 3%; text-align: center;'>" . _AM_XPARTNERS_IMAGE . "</th>\n" + . " <th>" . _AM_XPARTNERS_DESCRIPTION . "</th>\n" + . " <th class='width3 txtcenter'>" . _AM_XPARTNERS_ACTIVE . "</th>\n" + . " <th class='width3 txtcenter'>" . _AM_XPARTNERS_WEIGHT . "</th>\n" + . " <th class='width3 txtcenter'>" . _AM_XPARTNERS_HITS . "</th>\n" + . " <th class='width3 txtcenter'>" . _AM_XPARTNERS_ACTIONS . "</th>\n" + . " </tr>\n" + . " </thead>\n" + . " <tbody\n"; - $partnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname')); - $partnerCount = $partnerHandler->getCount(); - if ($partnerCount) { - /* - $result = $xoopsDB->query("SELECT id FROM ".$xoopsDB->prefix("partners")); - if ($xoopsDB->getRowsNum($result)) { - */ - foreach ($weight as $id => $order) { - if (intval($id) > 0) { - $order = (intval($order) > 0) ? intval($order) : 0; - $stat = isset($status[$id]) ? intval($status[$id]) : 0; - $thisObj = $partnerHandler->get($id); - if (is_object($thisObj) && count($thisObj)) { - $thisObj->setVars(array('weight' => $order, 'status' => $stat)); - $partnerHandler->insert($thisObj); - unset($thisObj); - } + $criteria = new CriteriaCompo(); + $criteria->setSort('status DESC, weight ASC, title'); + $criteria->setOrder('DESC'); + $partnerObjs = $xpPartnerHandler->getAll($criteria); + $class = 'even'; + $maxWidth = $GLOBALS['xoopsModuleConfig']['maxwidth']; + $maxHeight = $GLOBALS['xoopsModuleConfig']['maxheight']; + foreach ($partnerObjs as $partnerObj) { + $url = formatURL($partnerObj->getVar('url')); + $image = formatURL($partnerObj->getVar('image')); + $title = $partnerObj->getVar('title'); + $description = $partnerObj->getVar('description'); + //@TODO - find a way to check size of remote image if allow_url_fopen=0 + if ($imageInfo = @getimagesize($image)) { //note this will "fail" if server set with allow_url_fopen=0 + $imageWidth = $imageInfo[0]; + $imageHeight = $imageInfo[1]; + $errorMsg = ($imageWidth > $maxWidth || $imageHeight > $maxHeight) ? "<br />" . _AM_XPARTNERS_IMAGE_ERROR : ''; + } else { + $imageWidth = $maxWidth; + $imageHeight = $maxHeight; + $errorMsg = ''; } + if (1 == $partnerObj->getVar('status')) { + $check1 = " selected='selected'"; + $check2 = ""; + } else { + $check1 = ""; + $check2 = " selected='selected'"; + } + echo " <tr>\n" + . " <td class='{$class} width20 txtcenter alignmiddle'><a href='{$url}' rel='external'>{$title}</a></td>\n" + . " <td class='{$class} width3 txtcenter'>"; + if (!empty($image)) { + echo "<img src='{$image}' alt='{$title}' style='width: " . intval(.65 * $imageWidth) . "px; height: " . intval(.65 * $imageHeight) . "px;' />{$errorMsg}"; + } else { + echo " "; + } + + echo " </td>\n" + . " <td class='{$class} alignmiddle'>{$description}</td>\n" + . " <td class='{$class} width3 txtcenter alignmiddle'>\n" + . " <select name='status[" . $partnerObj->getVar('id') . "]'>\n" + . " <option value='0'{$check2}>" . _NO . "</option>\n" + . " <option value='1'{$check1}>" . _YES . "</option>\n" + . " </select>\n" + . " <td class='{$class} width3 txtcenter alignmiddle'>\n" + . " <input type='number' class='txtcenter' name='weight[" . $partnerObj->getVar('id') . "]' value='" . $partnerObj->getVar('weight') . "' min='0' size='3' />\n" + . " </td>\n" + . " <td class='{$class} width3 txtcenter alignmiddle'>" . $partnerObj->getVar('hits') . "</td>\n" + . " <td class='{$class} width3 txtcenter alignmiddle'>\n" + . " <a href='main.php?op=editPartner&id=" . $partnerObj->getVar('id') . "'><img src='{$pathImageIcon}/edit.png' alt='" . _EDIT . "' title='" . _EDIT . "' /></a>\n" + . " <a href='main.php?op=delPartner&id=" . $partnerObj->getVar('id') . "'><img src='{$pathImageIcon}/delete.png' alt='" . _DELETE . "' title='" . _DELETE . "' /></a>\n" + . " </td>\n" + . " </tr>\n"; + $class = ($class == 'odd') ? 'even' : 'odd'; } - redirect_header("main.php?op=default", 1, _AM_XPARTNERS_UPDATED); - } else { - redirect_header("main.php?op=partnersAdminAdd", 2, _AM_XPARTNERS_EMPTYDATABASE, false); - } -} + if (empty($partnerObjs)) { + echo "<tr><td class='{$class} txtcenter bold line140' colspan='7'>" . _AM_XPARTNERS_NOPARTNERS . "</td></tr>\n"; + $adminButtons = ''; + } else { + $adminButtons = " <input type='button' name='button' onclick=\"location='main.php?op=reorderAutoPartners'\" value='" . _AM_XPARTNERS_AUTOMATIC_SORT . "' />\n" + . " <input type='submit' name='submit' value='" . _AM_XPARTNERS_UPDATE . "' />"; -function reorderAutoPartners() -{ - global $xoopsModule; - //$xoopsDB =& Database::getInstance(); - $partnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname')); - $partnerObjs = $partnerHandler->getAll(null, array('weight')); - $partnerCount = count($partnerObjs); - $weight = 0; - if ($partnerCount > 1) { - foreach ($partnerObjs as $thisObj) { - $weight++; - $thisObj->setVar('weight', $weight); - $partnerHandler->insert($thisObj); - unset($thisObj); } - redirect_header("main.php?op=default", 1, _AM_XPARTNERS_UPDATED); - } else { - redirect_header("main.php?op=partnersAdminAdd", 2, _AM_XPARTNERS_EMPTYDATABASE, false); - } -} + echo" <tr>\n" + . " <td class='foot txtright' colspan='7'>\n" + . " <input type='hidden' name='op' value='reorderPartners' />\n" +// . " <input type='button' name='button' onclick=\"location='main.php?op=partnersAdminAdd'\" value='" . _AM_XPARTNERS_ADD . "' />\n" + . "{$adminButtons}\n" + . " </td>\n" + . " </tr>\n" + . " </tbody>\n" + . " </table>\n" + . " </form>\n"; -function partnersAdminAdd() -{ - global $xoopsModule, $indexAdmin, $pathImageIcon, $myts; - $xoopsDB =& XoopsDatabaseFactory::getDatabaseConnection(); -// $xoopsDB =& Database::getInstance(); + unset($partnerObjs); + include __DIR__ . '/admin_footer.php'; + break; - echo $indexAdmin->addNavigation('main.php?op=partnersAdminAdd'); - //echo "<h4>"._AM_XPARTNERS_ADD."</h4>"; - include XOOPS_ROOT_PATH . '/class/xoopsformloader.php'; - $form = new XoopsThemeForm(_AM_XPARTNERS_ADDPARTNER, "addform", "main.php", "post", true); - $formweight = new XoopsFormText(_AM_XPARTNERS_WEIGHT, "weight", 3, 10, 0); - $formimage = new XoopsFormText(_AM_XPARTNERS_IMAGE, "image", 100, 150, 'http://'); - $formurl = new XoopsFormText(_AM_XPARTNERS_URL, "url", 100, 150, 'http://'); - $formtitle = new XoopsFormText(_AM_XPARTNERS_TITLE, "title", 100, 150); - $formdesc = new XoopsFormTextArea(_AM_XPARTNERS_DESCRIPTION, "description", "", 10, "60"); - $statontxt - = " <img src=". $pathImageIcon .'/on.png'.' '. "alt='" . _AM_XPARTNERS_ACTIVE . "' /> " . _AM_XPARTNERS_ACTIVE - . " "; - $statofftxt - = " <img src=". $pathImageIcon .'/off.png' .' '."alt='" . _AM_XPARTNERS_INACTIVE . "' /> " - . _AM_XPARTNERS_INACTIVE . " "; - $formstat = new XoopsFormRadioYN(_AM_XPARTNERS_STATUS, 'status', 1, $statontxt, $statofftxt); - $opHidden = new XoopsFormHidden("op", "addPartner"); - $submitButton = new XoopsFormButton("", "submit", _AM_XPARTNERS_ADDPARTNER, "submit"); - $form->addElement($formtitle, true); - $form->addElement($formimage); - $form->addElement($formurl, true); - $form->addElement($formweight); - $form->addElement($formdesc, true); - $form->addElement($formstat); - $form->addElement($opHidden); - $form->addElement($submitButton); - $form->display(); - include 'admin_footer.php'; -} + case 'reorderPartners': + $weight = isset($_POST['weight']) ? XoopsRequest::getArray('weight', array(), 'POST') : null; + $status = isset($_POST['status']) ? XoopsRequest::getArray('status', array(), 'POST') : null; -function addPartner($weight=0, $url, $image, $title, $description, $status=0) -{ - global $xoopsModule, $xoopsDB, $myts; - - $partnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname')); - $newPartner = $partnerHandler->create(); - - $status = (intval($status) > 0) ? intval($status) : 0; - $weight = (intval($weight) > 0) ? intval($weight) : 0; - $title = isset($title) ? trim($title) : ''; - $url = isset($url) ? trim($url) : ''; - $image = isset($image) ? trim($image) : ''; - $image = $myts->addSlashes(formatURL($image)); - $description = isset($description) ? trim($description) : ''; - if ('' == $title || '' == $url || '' == $description) { - redirect_header('main.php?op=default', 2, _AM_XPARTNERS_BESURE); - } - /* - if (!empty($image)) { - $image_info = @getimagesize($image); - var_dump($image_info); - exit; - if (!$image_info[2]) { - redirect_header("main.php?op=default", 2, _AM_XPARTNERS_NOEXIST . '<br />(' . $image . ')'); + $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname')); + $partnerCount = $xpPartnerHandler->getCount(); + if ($partnerCount) { + foreach ($weight as $id => $order) { + if (intval($id) > XoopspartnersConstants::DEFAULT_PID) { + $order = ((!empty($order)) && (intval($order) > XoopspartnersConstants::DEFAULT_WEIGHT)) ? intval($order) : XoopspartnersConstants::DEFAULT_WEIGHT; + $stat = (!empty($status[$id]) && ($status[$id] > XoopspartnersConstants::STATUS_INACTIVE)) ? intval($status[$id]) : XoopspartnersConstants::STATUS_INACTIVE; + $thisObj = $xpPartnerHandler->get($id); + if (!empty($thisObj) && ($thisObj instanceof XoopspartnersPartners)) { + $thisObj->setVars(array('weight' => $order, 'status' => $stat)); + $xpPartnerHandler->insert($thisObj); + unset($thisObj); + } + } } + redirect_header("main.php", XoopspartnersConstants::REDIRECT_DELAY_SHORT, _AM_XPARTNERS_UPDATED); + } else { + redirect_header("main.php?op=partnersAdminAdd", XoopspartnersConstants::REDIRECT_DELAY_MEDIUM, _AM_XPARTNERS_EMPTYDATABASE, false); } + break; - if (!empty($image)) { - $image_info = exif_imagetype($image); - if (false === $image_info) { - redirect_header("main.php?op=default", 1, _AM_XPARTNERS_NOEXIST); + case 'reorderAutoPartners': + $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname')); + $partnerObjs = $xpPartnerHandler->getAll(null, array('weight')); + $partnerCount = count($partnerObjs); + $weight = XoopspartnersConstants::DEFAULT_WEIGHT; + if ($partnerCount > 1) { + foreach ($partnerObjs as $thisObj) { + ++$weight; + $thisObj->setVar('weight', $weight); + $xpPartnerHandler->insert($thisObj); + unset($thisObj); } + redirect_header('main.php', XoopspartnersConstants::REDIRECT_DELAY_SHORT, _AM_XPARTNERS_UPDATED); + } else { + redirect_header('main.php?op=partnersAdminAdd', XoopspartnersConstants::REDIRECT_DELAY_MEDIUM, _AM_XPARTNERS_EMPTYDATABASE, false); } - */ - $newPartner->setVar('url', $myts->addSlashes(formatURL($url))); - $newPartner->setVar('image', $image); - $newPartner->setVar('title', $myts->addSlashes($title)); - $newPartner->setVar('description', $myts->addSlashes($description)); - $newPartner->setVar('status', $status); - $newPartner->setVar('weight', $weight); + break; - if ($GLOBALS['xoopsSecurity']->check() && $partnerHandler->insert($newPartner)) { - /* - $sql = "INSERT INTO ".$xoopsDB->prefix("partners")." VALUES (NULL, ".intval($weight).", 0, '$url', '$image', '$title', '$description', $status)"; - if ($GLOBALS['xoopsSecurity']->check() && $xoopsDB->query($sql)) { - */ - redirect_header("main.php?op=default", 1, _AM_XPARTNERS_UPDATED); - } else { - redirect_header("main.php?op=default", 1, _AM_XPARTNERS_NOTUPDATED . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()) + case 'partnersAdminAdd': + echo $adminClass->addNavigation('main.php?op=partnersAdminAdd'); + //echo "<h4>"._AM_XPARTNERS_ADD."</h4>"; + + include $GLOBALS['xoops']->path('/class/xoopsformloader.php'); + $form = new XoopsThemeForm(_AM_XPARTNERS_ADDPARTNER, "addform", "main.php", "post", true); + $formWeight = new XoopsFormText(_AM_XPARTNERS_WEIGHT, "weight", 3, 10, XoopspartnersConstants::DEFAULT_WEIGHT); + $formImage = new XoopsFormText(_AM_XPARTNERS_IMAGE, "image", 100, 150, 'http://'); + $formUrl = new XoopsFormText(_AM_XPARTNERS_URL, "url", 100, 150, 'http://'); + $formTitle = new XoopsFormText(_AM_XPARTNERS_TITLE, "title", 100, 150); + $formDesc = new XoopsFormTextArea(_AM_XPARTNERS_DESCRIPTION, "description", "", 10, "60"); + $statOnTxt + = " <img src='{$pathImageIcon}/on.png' alt='" . _AM_XPARTNERS_ACTIVE . "' /> " . _AM_XPARTNERS_ACTIVE + . " "; + $statOffTxt + = " <img src='{$pathImageIcon}/off.png' alt='" . _AM_XPARTNERS_INACTIVE . "' /> " + . _AM_XPARTNERS_INACTIVE . " "; + $formStat = new XoopsFormRadioYN(_AM_XPARTNERS_STATUS, 'status', XoopspartnersConstants::STATUS_ACTIVE, $statOnTxt, $statOffTxt); + $opHidden = new XoopsFormHidden("op", "addPartner"); + $submitButton = new XoopsFormButton("", "submit", _AM_XPARTNERS_ADDPARTNER, "submit"); + $form->addElement($formTitle, true); + $form->addElement($formImage); + $form->addElement($formUrl, true); + $form->addElement($formWeight); + $form->addElement($formDesc, true); + $form->addElement($formStat); + $form->addElement($opHidden); + $form->addElement($submitButton); + $form->display(); + include __DIR__ . '/admin_footer.php'; + break; + + case 'addPartner': + $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname')); + $newPartner = $xpPartnerHandler->create(); + $status = ((!empty($status)) && (intval($status) > 0)) ? intval($status) : XoopspartnersConstants::STATUS_INACTIVE; + $weight = XoopsRequest::getInt('weight', XoopspartnersConstants::DEFAULT_WEIGHT, 'POST'); + $title = isset($title) ? trim($title) : ''; + $url = isset($url) ? trim($url) : ''; + $image = isset($image) ? trim($image) : ''; + $image = $myts->addSlashes(formatURL($image)); + $description = isset($description) ? trim($description) : ''; + if (empty($title) || empty($url) || empty($description)) { + redirect_header('main.php', XoopspartnersConstants::REDIRECT_DELAY_MEDIUM, _AM_XPARTNERS_BESURE); + } + $newPartner->setVars(array('url' => $myts->addSlashes(formatURL($url)), + 'image' => $image, + 'title' => $myts->addSlashes($title), + 'description' => $myts->addSlashes($description), + 'status' => $status, + 'weight' => $weight) ); - } -} -function editPartner($id=0) -{ - global $xoopsModule, $indexAdmin, $pathImageIcon, $xoopsDB, $myts; + if ($GLOBALS['xoopsSecurity']->check() && $xpPartnerHandler->insert($newPartner)) { + redirect_header('main.php', XoopspartnersConstants::REDIRECT_DELAY_SHORT, _AM_XPARTNERS_UPDATED); + } else { + redirect_header('main.php', XoopspartnersConstants::REDIRECT_DELAY_MEDIUM, _AM_XPARTNERS_NOTUPDATED . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors()) + ); + } + break; - echo $indexAdmin->addNavigation('main.php?op=default'); - $id = (intval($id) > 0) ? intval($id) : 0; + case 'editPartner': + echo $adminClass->addNavigation('main.php'); + $id = (intval($id) > XoopspartnersConstants::DEFAULT_PID) ? intval($id) : XoopspartnersConstants::DEFAULT_PID; - //echo "<h4>"._EDIT."</h4>"; - $partnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname')); - $partnerObj = $partnerHandler->get($id); - if (is_object($partnerObj) && count($partnerObj)) { - /* - $result = $xoopsDB->query("SELECT weight, hits, url, image, title, description, status FROM ".$xoopsDB->prefix("partners")." WHERE id={$id}"); - list($weight, $hits, $url, $image, $title, $description, $status) = $xoopsDB->fetchrow($result); - */ - $partnerVars = $partnerObj->getValues(); - $url = $myts->htmlSpecialChars($partnerVars['url']); - $image = $myts->htmlSpecialChars($partnerVars['image']); - $title = $myts->htmlSpecialChars($partnerVars['title']); - $description = $myts->htmlSpecialChars($partnerVars['description']); + $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname')); + $partnerObj = $xpPartnerHandler->get($id); + if (!empty($partnerObj) && ($partnerObj instanceof XoopspartnersPartners)) { + $partnerVars = $partnerObj->getValues(); + //url, image, title, and description are all txtboxes so they have gone through htmlspecialchars via XoopsObject getVar - include XOOPS_ROOT_PATH . "/class/xoopsformloader.php"; - $form = new XoopsThemeForm(_AM_XPARTNERS_EDITPARTNER, "editform", "main.php", "post", true); - $formweight = new XoopsFormText(_AM_XPARTNERS_WEIGHT, "weight", 3, 10, $partnerVars['weight']); - $formhits = new XoopsFormText(_AM_XPARTNERS_HITS, "hits", 3, 10, $partnerVars['hits']); - $formimage = new XoopsFormText(_AM_XPARTNERS_IMAGE, "image", 50, 150, $image); - $formurl = new XoopsFormText(_AM_XPARTNERS_URL, "url", 50, 150, $url); - $formtitle = new XoopsFormText(_AM_XPARTNERS_TITLE, "title", 50, 150, $title); - $formdesc = new XoopsFormTextArea(_AM_XPARTNERS_DESCRIPTION, "description", $description, 10, "100%"); - $statontxt = " <img src='{$pathImageIcon}/on.png' alt='" - . _AM_XPARTNERS_ACTIVE . "' /> " - . _AM_XPARTNERS_ACTIVE . " "; - $statofftxt = " <img src='{$pathImageIcon}/off.png' alt='" - . _AM_XPARTNERS_INACTIVE . "' /> " - . _AM_XPARTNERS_INACTIVE . " "; + include $GLOBALS['xoops']->path("/class/xoopsformloader.php"); + $form = new XoopsThemeForm(_AM_XPARTNERS_EDITPARTNER, 'editform', 'main.php', "post", true); + $formWeight = new XoopsFormText(_AM_XPARTNERS_WEIGHT, 'weight', 3, 10, $partnerVars['weight']); + $formHits = new XoopsFormText(_AM_XPARTNERS_HITS, 'hits', 3, 10, $partnerVars['hits']); + $formImage = new XoopsFormText(_AM_XPARTNERS_IMAGE, 'image', 50, 150, $partnerVars['image']); + $formUrl = new XoopsFormText(_AM_XPARTNERS_URL, 'url', 50, 150, $partnerVars['url']); + $formTitle = new XoopsFormText(_AM_XPARTNERS_TITLE, 'title', 50, 150, $partnerVars['title']); + $formDesc = new XoopsFormTextArea(_AM_XPARTNERS_DESCRIPTION, 'description', $partnerVars['description'], 10, '100%'); - $formstat = new XoopsFormRadioYN(_AM_XPARTNERS_STATUS, 'status', $partnerVars['status'], $statontxt, $statofftxt); - $submitButton = new XoopsFormButton("", "submit", _SUBMIT, "submit"); - $form->addElement($formtitle, true); - $form->addElement($formimage); - $form->addElement($formurl, true); - $form->addElement($formweight); - $form->addElement($formdesc, true); - $form->addElement($formhits); - $form->addElement($formstat); - $form->addElement(new XoopsFormHidden("id", $id)); - $form->addElement(new XoopsFormHidden("op", "updatePartner")); - $form->addElement($submitButton); - $form->display(); - include 'admin_footer.php'; - } else { - redirect_header("main.php?op=default", 2, _AM_XPARTNERS_INVALIDID); - } -} + $statOnTxt = " <img src='{$pathImageIcon}/on.png' alt='" . _AM_XPARTNERS_ACTIVE . "' /> " . _AM_XPARTNERS_ACTIVE . " "; + $statOffTxt = " <img src='{$pathImageIcon}/off.png' alt='" . _AM_XPARTNERS_INACTIVE . "' /> " . _AM_XPARTNERS_INACTIVE . " "; + $formStat = new XoopsFormRadioYN(_AM_XPARTNERS_STATUS, 'status', $partnerVars['status'], $statOnTxt, $statOffTxt); -function updatePartner($id, $weight, $hits, $url, $image, $title, $description, $status) -{ - global $xoopsModule, $xoopsDB, $myts; + $submitButton = new XoopsFormButton("", "submit", _SUBMIT, "submit"); + $form->addElement($formTitle, true); + $form->addElement($formImage); + $form->addElement($formUrl, true); + $form->addElement($formWeight); + $form->addElement($formDesc, true); + $form->addElement($formHits); + $form->addElement($formStat); + $form->addElement(new XoopsFormHidden("id", $id)); + $form->addElement(new XoopsFormHidden("op", "updatePartner")); + $form->addElement($submitButton); + $form->display(); + include __DIR__ . '/admin_footer.php'; + } else { + redirect_header("main.php", XoopspartnersConstants::REDIRECT_DELAY_MEDIUM, _AM_XPARTNERS_INVALIDID); + } + break; - $title = isset($title) ? trim($title) : ''; - $image = isset($image) ? trim($image) : ''; - $image = $myts->addSlashes(formatURL($image)); - $url = isset($url) ? trim($url) : ''; - $description = isset($description) ? trim($description) : ''; - $id = (isset($id) && intval($id) > 0) ? intval($id) : 0; - $status = isset($status) ? intval($status) : 0; - $weight = isset($weight) ? intval($weight) : 0; - $hits = (isset($hits) && intval($hits) > 0) ? intval($hits) : 0; - if ($title == '' || $url == '' || empty($id) || $description == '') { - redirect_header("main.php?op=edit_partner&id={$id}", 1, _AM_XPARTNERS_BESURE); - } - /* - if (!empty($image)) { - $image_info = exif_imagetype($image);; - if (false === $image_info) { - redirect_header("main.php?op=edit_partner&id={$id}", 1, _AM_XPARTNERS_NOEXIST); + case 'updatePartner': + $title = isset($title) ? trim($title) : ''; + $image = isset($image) ? trim($image) : ''; + $image = $myts->addSlashes(formatURL($image)); + $url = isset($url) ? trim($url) : ''; + $description = isset($description) ? trim($description) : ''; + $id = ($id > XoopspartnersConstants::DEFAULT_PID) ? $id : XoopspartnersConstants::DEFAULT_PID; + $status = ((!empty($status)) && ($status > XoopspartnersConstants::STATUS_INACTIVE)) ? intval($status) : XoopspartnersConstants::STATUS_INACTIVE; + $weight = XoopsRequest::getInt('weight', XoopspartnersConstants::DEFAULT_WEIGHT, 'POST'); + $weight = (($weight > XoopspartnersConstants::DEFAULT_WEIGHT)) ? $weight : XoopspartnersConstants::DEFAULT_WEIGHT; + $hits = ((!empty($hits)) && (intval($hits) > 0)) ? intval($hits) : 0; + if ($title == '' || $url == '' || empty($id) || $description == '') { + redirect_header("main.php?op=edit_partner&id={$id}", XoopspartnersConstants::REDIRECT_DELAY_SHORT, _AM_XPARTNERS_BESURE); + } + /* + if (!empty($image)) { + $image_info = exif_imagetype($image);; + if (false === $image_info) { + redirect_header("main.php?op=edit_partner&id={$id}", 1, _AM_XPARTNERS_NOEXIST); + } } + */ + $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname')); + $partnerObj = $xpPartnerHandler->get($id); + if ($GLOBALS['xoopsSecurity']->check() && ($partnerObj instanceof XoopspartnersPartners)) { + $partnerObj->setVar('url', $myts->addSlashes(formatURL($url))); + $partnerObj->setVar('title', $myts->addSlashes($title)); + $partnerObj->setVar('description', $myts->addSlashes($description)); + $partnerObj->setVar('hits', $hits); + $partnerObj->setVar('weight', $weight); + $partnerObj->setVar('status', $status); + $partnerObj->setVar('image', $image); + $success = $xpPartnerHandler->insert($partnerObj); + if ($success) { + redirect_header("main.php", XoopspartnersConstants::REDIRECT_DELAY_SHORT, _AM_XPARTNERS_UPDATED); + } } - */ - $partnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname')); - $partnerObj = $partnerHandler->get($id); - if ($GLOBALS['xoopsSecurity']->check() && is_object($partnerObj) && count($partnerObj)) { - $partnerObj->setVar('url', $myts->addSlashes(formatURL($url))); - $partnerObj->setVar('title', $myts->addSlashes($title)); - $partnerObj->setVar('description', $myts->addSlashes($description)); - $partnerObj->setVar('hits', $hits); - $partnerObj->setVar('weight', $weight); - $partnerObj->setVar('status', $status); - $partnerObj->setVar('image', $image); - $success = $partnerHandler->insert($partnerObj); - if ($success) { - redirect_header("main.php?op=default", 1, _AM_XPARTNERS_UPDATED); - } - } - redirect_header("main.php?op=default", 1, _AM_XPARTNERS_NOTUPDATED . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); -} + redirect_header("main.php", XoopspartnersConstants::REDIRECT_DELAY_MEDIUM, _AM_XPARTNERS_NOTUPDATED . "<br />" . implode('<br />', $GLOBALS['xoopsSecurity']->getErrors())); + break; -function delPartner($id, $del = 0) -{ - global $xoopsModule, $indexAdmin, $xoopsDB; - $id = (isset($id) && intval($id)) ? intval($id) : 0; - if ((1 == $del) && ($id > 0)) { - $partnerHandler =& xoops_getmodulehandler('partners', $xoopsModule->getVar('dirname')); - $partnerObj = $partnerHandler->get($id); - if (is_object($partnerObj) && count($partnerObj)) { - if ($partnerHandler->delete($partnerObj)) { - redirect_header("main.php?op=default", 1, _AM_XPARTNERS_UPDATED); + case 'delPartner': + if ((XoopspartnersConstants::CONFIRM_OK == $del) && ($id > XoopspartnersConstants::DEFAULT_PID)) { + $xpPartnerHandler =& xoops_getmodulehandler('partners', $GLOBALS['xoopsModule']->getVar('dirname')); + $partnerObj = $xpPartnerHandler->get($id); + if ($partnerObj instanceof XoopspartnersPartners) { + if ($xpPartnerHandler->delete($partnerObj)) { + redirect_header('main.php', XoopspartnersConstants::REDIRECT_DELAY_SHORT, _AM_XPARTNERS_UPDATED); + } } + redirect_header('main.php', XoopspartnersConstants::REDIRECT_DELAY_MEDIUM, _AM_XPARTNERS_NOTUPDATED); + } else { + echo $adminClass->addNavigation('main.php'); + xoops_confirm(array('op' => 'delPartner', 'id' => intval($id), 'del' => XoopspartnersConstants::CONFIRM_OK), 'main.php', _AM_XPARTNERS_SUREDELETE); + include __DIR__ . '/admin_footer.php'; } - redirect_header("main.php?op=default", 1, _AM_XPARTNERS_NOTUPDATED); - } else { - echo $indexAdmin->addNavigation('main.php?op=default'); - xoops_confirm(array('op' => 'delPartner', 'id' => intval($id), 'del' => 1), 'main.php', _AM_XPARTNERS_SUREDELETE); - include 'admin_footer.php'; - } + break; } - -$op = ''; - -$fields = array('op', 'id', 'weight', 'hits', 'url', 'image', 'tit... [truncated message content] |
From: <be...@us...> - 2015-02-20 09:09:28
|
Revision: 13005 http://sourceforge.net/p/xoops/svn/13005 Author: beckmi Date: 2015-02-20 09:09:25 +0000 (Fri, 20 Feb 2015) Log Message: ----------- Adding changes from Zyspec Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/admin/admin_header.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/admin/menu.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/blocks/mymenus_block.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/docs/changelog.txt XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/bootstrap/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/clean/templates/template.tpl XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/superfish/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/superfish_navbar/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_blue/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/sql/mysql.sql XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/xoops_version.php Added Paths: ----------- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/css/style.css XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/css/pro_dropdown_3.css XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_purple.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_white.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_over.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/navbar-bg.png XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/css/pro_dropdown_3.css XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow_over.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0a.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1a.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_blue/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_blue/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_blue/css/tw_blue.css XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/css/tw_red.css XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/menu_left.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/menu_mid.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/menu_right.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/nav-bg.png XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/split.png XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/submenu_bg.png XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/submenu_bottom.png XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/images/submenu_top.png XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/templates/ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/templates/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/templates/template.html XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_red/templates/template.tpl Removed Paths: ------------- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/style.css XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/arrow.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/arrow_down_purple.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/arrow_down_white.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/arrow_over.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/navbar-bg.png XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/pro_dropdown_3.css XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/arrow.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/arrow_over.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/pro_dropdown_3.css XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/three_0.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/three_0a.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/three_1.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/three_1a.gif XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/tw_blue/tw_blue.css Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/admin/admin_header.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/admin/admin_header.php 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/admin/admin_header.php 2015-02-20 09:09:25 UTC (rev 13005) @@ -27,8 +27,8 @@ //global $xoopsModule; $moduleInfo = $module_handler->get($xoopsModule->getVar('mid')); -$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); -$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); +$pathIcon16 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons16')); +$pathIcon32 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons32')); $indexAdmin = new ModuleAdmin(); Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/admin/menu.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/admin/menu.php 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/admin/menu.php 2015-02-20 09:09:25 UTC (rev 13005) @@ -23,7 +23,7 @@ $dirname = basename(dirname(__DIR__)); $module_handler = xoops_gethandler('module'); $module = $module_handler->getByDirname($dirname); -$pathIcon32 = $module->getInfo('icons32'); +$pathIcon32 = '../../' . $module->getInfo('icons32'); xoops_loadLanguage('admin', $dirname); Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/blocks/mymenus_block.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/blocks/mymenus_block.php 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/blocks/mymenus_block.php 2015-02-20 09:09:25 UTC (rev 13005) @@ -8,17 +8,16 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ - /** - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License + * @copyright {@link http://sourceforge.net/projects/xoops/ The XOOPS Project} + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} * @package Mymenus * @since 1.0 * @author trabis <lus...@gm...> * @version $Id$ */ -defined('XOOPS_ROOT_PATH') or exit("Restricted access"); +defined('XOOPS_ROOT_PATH') || exit("Restricted access"); /** * @param $options @@ -29,7 +28,7 @@ { $block = array(); global $xoTheme, $xoopsLogger; - $xoopsLogger->startTime('My Menus Block'); + $xoopsLogger->startTime('MyMenus Block'); $myts =& MyTextSanitizer::getInstance(); include_once $GLOBALS['xoops']->path('modules/mymenus/include/functions.php'); @@ -38,17 +37,17 @@ include_once $GLOBALS['xoops']->path('modules/mymenus/class/builder.php'); $registry =& MymenusRegistry::getInstance(); - $plugin =& MymenusPlugin::getInstance(); + $plugin =& MymenusPlugin::getInstance(); $plugin->triggerEvent('Boot'); - $menu_id = $options[0]; + $menuId = $options[0]; - $this_handler =& xoops_getModuleHandler('links', 'mymenus'); - $criteria = new CriteriaCompo(new Criteria('mid', $menu_id)); + $linksHandler =& xoops_getModuleHandler('links', 'mymenus'); + $criteria = new CriteriaCompo(new Criteria('mid', $menuId)); $criteria->setSort('weight'); $criteria->setOrder('ASC'); //get menus as an array with ids as keys - $menus = $this_handler->getAll($criteria, null, false, false); + $menus = $linksHandler->getAll($criteria, null, false, false); unset($criteria); foreach ($menus as $key => $links) { @@ -78,84 +77,84 @@ $menus = $registry->getEntry('menus'); $builder = new MymenusBuilder($menus); - $block = $builder->render(); + $block = $builder->render(); /*--------------------------------------------------------------*/ //default files to load - $css = array(); - $js = array(); + $cssArray = array(); + $jsArray = array(); //get extra files from skins - $skin = $options[1]; - $skin_info = mymenus_getSkinInfo($skin, $options[2], $options[3]); + $skin = $options[1]; + $skinInfo = mymenus_getSkinInfo($skin, $options[2], $options[3]); - if (isset($skin_info['css'])) { - $css = array_merge($css, $skin_info['css']); + if (isset($skinInfo['css'])) { + $cssArray = array_merge($cssArray, $skinInfo['css']); } - if (isset($skin_info['js'])) { - $js = array_merge($js, $skin_info['js']); + if (isset($skinInfo['js'])) { + $jsArray = array_merge($jsArray, $skinInfo['js']); } $config = mymenus_getModuleConfig(); if ('xoopstpl' == $config['assign_method']) { $tpl_vars = ''; - foreach ($css as $file) { - $tpl_vars .= "\n" . '<link rel="stylesheet" type="text/css" media="all" href="' . $file . '" />'; + foreach ($cssArray as $file) { + $tpl_vars .= "\n<link rel='stylesheet' type='text/css' media='all' href='{$file}' />"; } - foreach ($js as $file) { - $tpl_vars .= "\n" . '<script type="text/javascript" src="' . $file . '"></script>'; + foreach ($jsArray as $file) { + $tpl_vars .= "\n<script type='text/javascript' src='{$file}'></script>"; } - if (isset($skin_info['header'])) { - $tpl_vars .= "\n" . $skin_info['header']; + if (isset($skinInfo['header'])) { + $tpl_vars .= "\n{$skinInfo['header']}"; } $GLOBALS['xoopsTpl']->assign('xoops_module_header' , $tpl_vars . @$GLOBALS['xoopsTpl']->get_template_vars("xoops_module_header")); } else { - foreach ($css as $file) { + foreach ($cssArray as $file) { $xoTheme->addStylesheet($file); } - foreach ($js as $file) { + foreach ($jsArray as $file) { $xoTheme->addScript($file); } - if (isset($skin_info['header'])) { - $GLOBALS['xoopsTpl']->assign('xoops_footer' , @$GLOBALS['xoopsTpl']->get_template_vars("xoops_footer") . "\n" . $skin_info['header']); + if (isset($skinInfo['header'])) { + $GLOBALS['xoopsTpl']->assign('xoops_footer' , @$GLOBALS['xoopsTpl']->get_template_vars("xoops_footer") . "\n" . $skinInfo['header']); } } $blockTpl = new XoopsTpl(); - $blockTpl->assign('block', $block); - $blockTpl->assign('config', $skin_info['config']); - $blockTpl->assign('skinurl', $skin_info['url']); - $blockTpl->assign('skinpath', $skin_info['path']); + $blockTpl->assign(array('block' => $block, + 'config' => $skinInfo['config'], + 'skinurl' => $skinInfo['url'], + 'skinpath' => $skinInfo['path'], + 'xlanguage' => xoops_isActiveModule('xlanguage') ? true : false) // xLanguage check + ); - // xLanguage check - if (xoops_isActiveModule('xlanguage')) { - $blockTpl->assign('xlanguage', true); - } + /*assign ul class*/ + $menuCss = ''; + $menusHandler = xoops_getModuleHandler('menus', 'mymenus'); + $menuCriteria = new CriteriaCompo(new Criteria('id', $menuId)); + $menuArray = $menusHandler->getAll($menuCriteria, null, false, false); - /*assign ul class*/ - $menucss=''; - $menus_handler = xoops_getModuleHandler('menus', 'mymenus'); - $menucriteria = new CriteriaCompo(new Criteria('id', $menu_id)); - $menuObj = $menus_handler->getAll($menucriteria, null, false, false); - $itemsCount = count($menuObj); - if ($menuObj) { - for ($i = 0; $i < $itemsCount; ++$i) { - $menucss = isset($menuObj[$i]['css']) ? $menuObj[$i]['css']: ''; + if (is_array($menuArray) && (count($menuArray) > 0)) { + foreach ($menuArray as $menu) { + $menuCss = isset($menu['css']) ? "{$menu['css']} " : ''; } + $menuCss = trim($menuCss); } - if (!$menucss) { - $menucss = ""; + if (empty($menuCss)) { + $menuCss = ""; + } else { + $menuCss = implode(' ', $menuCss); } - $blockTpl->assign('menucss', $menucss); + $blockTpl->assign('menucss', $menuCss); - $block['content'] = $blockTpl->fetch($skin_info['template']); + $block['content'] = $blockTpl->fetch($skinInfo['template']); if ('template' == $options[3]) { $GLOBALS['xoopsTpl']->assign($options[4] , $block['content']); @@ -164,7 +163,7 @@ $registry->unsetAll(); unset($registry, $plugin); - $xoopsLogger->stopTime('My Menus Block'); + $xoopsLogger->stopTime('MyMenus Block'); return $block; } @@ -181,13 +180,13 @@ $options[3] = time(); } $i = 0; - $menus_handler =& xoops_getModuleHandler('menus', 'mymenus'); + $menusHandler =& xoops_getModuleHandler('menus', 'mymenus'); xoops_loadLanguage('admin', 'mymenus'); $criteria = new CriteriaCompo(); $criteria->setSort('title'); $criteria->setOrder('ASC'); - $menus = $menus_handler->getList($criteria); + $menus = $menusHandler->getList($criteria); unset($criteria); if (0 == count($menus)) { Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/docs/changelog.txt =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/docs/changelog.txt 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/docs/changelog.txt 2015-02-20 09:09:25 UTC (rev 13005) @@ -1,4 +1,13 @@ -<b><u>Version 1.51 Beta 1 (2015-01-20)</u></b> +<u>Version 1.51 Beta 2 (2015-02-19)</u> +- change to use XOOPS jquery js from Frameworks +- cleaned up skins directories to use common structure (/css, /images) +- fixed bug in rendering menucss in block +- added tw_red skin, inadvertently removed in previous release +- added mid KEY for SQL to improve performance for common queries +- normalized icons16 & icons32 definitions similar to other XOOPS modules +- more code cleanup + +<u>Version 1.51 Beta 1 (2015-01-20)</u> - fixed bug where editing menu item put item in 1st menu - fixed reference to JS files since moved to /assets - fixed/improve menu HTML rendering so it can validate @@ -11,65 +20,63 @@ - updated superfish to v1.7.5 - general code cleanup -<b><u>Version 1.5 Beta 4 (2014-04-23)</u></b> +<u>Version 1.5 Beta 4 (2014-04-23)</u> - moved all images, CSS, and JS files to /assets (mamba) - renamed .html Smarty templates to .tpl (mamba) -<b><u>Version 1.5 Beta 3 (2014-03-21)</u></b> +<u>Version 1.5 Beta 3 (2014-03-21)</u> - fixed bug: when editing a menu it looses the parent id (trabis) - changes: Prefix is not used anymore when assigning menus to smarty, choose full name now (trabis) - added: bootstrap skin with multi level menu support, requires a bootstrap theme prepared to hold the menu (trabis) - added: checks for multilingual menus to show only when the language is present (fla-ts/mamba) - fixed: bug with adding XOOPS_URL to images (mamba) -<b><u>Version 1.5 Beta 2 (2014-02-10)</u></b> +<u>Version 1.5 Beta 2 (2014-02-10)</u> - fixed some minor issues with block options (mamba) -<b><u>Version 1.5 Beta 1 (2014-02-08)</u></b> +<u>Version 1.5 Beta 1 (2014-02-08)</u> - merged @luciorota code: possibility to have more then one skin provided in the theme (bleekk) -<b><u>Version 1.454 Beta 1 (2014-01-29)</u></b> +<u>Version 1.454 Beta 1 (2014-01-29)</u> - Code cleanup (mamba) - bug fix: delete submenus when parent menuitem is deleted (bleekk) -<b><u>Version 1.45 Beta 1 (2014-01-29)</u></b> +<u>Version 1.45 Beta 1 (2014-01-29)</u> - german language (muki) - add feedback loading icon (bleekk) - add css classes for menus, important for <ul> style (bleekk) -<b><u>Version 1.44 Beta 1 (2014-01-28)</u></b> +<u>Version 1.44 Beta 1 (2014-01-28)</u> - added update module (bleekk) - fixed module admin templates (bleekk) - -<b><u>Version 1.43 Beta 1 (2014-01-25)</u></b> +<u>Version 1.43 Beta 1 (2014-01-25)</u> - added Drag & Drop with submenu option for menu links (bleekk) - added edit option for links in dialog window (bleekk) - added clean skin (bleekk) - changed css style to css class for links (bleekk) -<b><u>Version 1.42 Beta 1 (2012-12-17)</u></b> +<u>Version 1.42 Beta 1 (2012-12-17)</u> - added Drag & Drop for menu links (mamba) - renamed "menu" with "links" (mamba) - -<b><u>Version 1.41 (2012-12-17)</u></b> +<u>Version 1.41 (2012-12-17)</u> - small adjustments (mamba) -<b><u>Version 1.4 (2011-12-05)</u></b> +<u>Version 1.4 (2011-12-05)</u> - converted to XOOPS 2.5.x GUI (mamba) -<b><u>Version 1.3 (2011-04-02)</u></b> +<u>Version 1.3 (2011-04-02)</u> - bug fix : Dynamic.php plugin not loading module modinfo language. -<b><u>Version 1.2 (2010-09-20)</u></b> +<u>Version 1.2 (2010-09-20)</u> - bug fix : When visiting site.com when XOOPS_URL is set to www.site.com we get a blank page! -<b><u>Version 1.1 (2010-08-19)</u></b> +<u>Version 1.1 (2010-08-19)</u> - added plugin for displaying smarty variables. - added plugin for displaying constants. - image link must be a valid url, relative to root is deprecated. -<b><u>Version 1.0 (2010-08-11)</u></b> +<u>Version 1.0 (2010-08-11)</u> - First public release of the module. Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/bootstrap/skin_version.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/bootstrap/skin_version.php 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/bootstrap/skin_version.php 2015-02-20 09:09:25 UTC (rev 13005) @@ -26,7 +26,8 @@ ); $skinversion['js'] = array( - '../../assets/js/jquery-1.11.2.min.js', +// '../../assets/js/jquery-1.11.2.min.js', + '../../../../browse.php?Frameworks/jquery/jquery.js', '../../assets/js/hoverIntent.js', '../../assets/js/superfish.js' ); Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/css/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/css/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/css/index.html 2015-02-20 09:09:25 UTC (rev 13005) @@ -0,0 +1 @@ +<script>history.go(-1);</script> Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/css/style.css =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/css/style.css (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/css/style.css 2015-02-20 09:09:25 UTC (rev 13005) @@ -0,0 +1,35 @@ +.mymenus-breadcrumb { + font: 11px Arial, Helvetica, sans-serif; + background-repeat: repeat-x; + height: 30px; + line-height: 30px; + color: #9b9b9b; + border: solid 1px #cacaca; + width: 100%; + overflow: hidden; + margin: 0; + padding: 0; +} +.mymenus-breadcrumb li { + list-style-type: none; + float: left; + padding-left: 10px; +} + +.mymenus-breadcrumb a { + height: 30px; + display: block; + background: no-repeat right; + padding-right: 15px; + text-decoration: none; + color: #454545; +} + +.mymenus-breadcrumb a:hover { + color: #35acc5; +} + +.mymenus-breadcrumb-home { + border: none; + margin: 8px 0; +} Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/skin_version.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/skin_version.php 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/skin_version.php 2015-02-20 09:09:25 UTC (rev 13005) @@ -20,7 +20,7 @@ $skinversion['template'] = 'templates/template.tpl'; -$skinversion['css'] = 'style.css'; +$skinversion['css'] = 'css/style.css'; /* $skinversion['js'] = array(); Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/style.css =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/style.css 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/breadcrumb/style.css 2015-02-20 09:09:25 UTC (rev 13005) @@ -1,35 +0,0 @@ -.mymenus-breadcrumb { - font: 11px Arial, Helvetica, sans-serif; - background-repeat: repeat-x; - height: 30px; - line-height: 30px; - color: #9b9b9b; - border: solid 1px #cacaca; - width: 100%; - overflow: hidden; - margin: 0; - padding: 0; -} -.mymenus-breadcrumb li { - list-style-type: none; - float: left; - padding-left: 10px; -} - -.mymenus-breadcrumb a { - height: 30px; - display: block; - background: no-repeat right; - padding-right: 15px; - text-decoration: none; - color: #454545; -} - -.mymenus-breadcrumb a:hover { - color: #35acc5; -} - -.mymenus-breadcrumb-home { - border: none; - margin: 8px 0; -} Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/clean/templates/template.tpl =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/clean/templates/template.tpl 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/clean/templates/template.tpl 2015-02-20 09:09:25 UTC (rev 13005) @@ -1,10 +1,6 @@ <{foreach item=menu from=$block}> <{ if $menu.oul && $menu.level == 0}> -<{ if $menucss != ''}> -<ul class="<{$menucss}>"> -<{ else}> -<ul> -<{ /if}> +<ul<{if $menucss != ''}> class="<{$menucss}>"<{/if}>> <{ /if}> <{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}> Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/arrow.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/arrow_down_purple.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/arrow_down_white.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/arrow_over.gif =================================================================== (Binary files differ) Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/css/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/css/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/css/index.html 2015-02-20 09:09:25 UTC (rev 13005) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/css/pro_dropdown_3.css =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/css/pro_dropdown_3.css (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/css/pro_dropdown_3.css 2015-02-20 09:09:25 UTC (rev 13005) @@ -0,0 +1,228 @@ +/* ================================================================ +This copyright notice must be kept untouched in the stylesheet at +all times. + +The original version of this stylesheet and the associated (x)html +is available at http://www.stunicholls.com/menu/pro_dropdown_3.html +Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. +This stylesheet and the associated (x)html may be modified in any +way to fit your requirements. +=================================================================== */ +.default_preload1 { /*background: url(three_0a.gif);*/ + +} + +.default_preload2 { /*background: url(three_1a.gif);*/ + +} + +#default_nav { + padding: 0; + margin: 0; + height: 30px; + min-height: 30px; + background: #846add url(../images/navbar-bg.png) repeat-x left bottom; + /*#846add*/ + color: #fff; + font-size: 1.1em; + text-align: center; + list-style-type: none; + position: relative; + z-index: 500; +} + +#default_nav li.default_top { + display: block; + float: left; +} + +#default_nav li a.default_top_link { + display: block; + float: left; + height: 23px; + line-height: 20px; + color: #fff; + text-decoration: none; + font-size: 11px; + font-weight: bold; + padding: 0 0 0 12px; + cursor: pointer; + /*background-color:#ddd;*/ /*background: url(three_0.gif);*/ +} + +#default_nav li a.default_top_link span { + float: left; + display: block; + padding: 0 24px 0 12px; + height: 23px; + /*background: url(three_0.gif) right top no-repeat;*/ +} + +#default_nav li a.default_top_link span.default_down { + float: left; + display: block; + padding: 0 24px 0 12px; + height: 23px; + background: url(../images/arrow_down_white.gif) 90% 50% no-repeat; +} + +#default_nav li:hover a.default_top_link,#default_nav li a.default_selected + { + color: #846add; + background-color: #ddd; + border-bottom: 3px solid #846add; +} + +#default_nav li:hover a.default_top_link span,#default_nav li a.default_selected span + { + background-color: #ddd; +} + +#default_nav li:hover a.default_top_link span.default_down,#default_nav li a.default_selected span.default_down + { + background: #ddd url(../images/arrow_down_purple.gif) no-repeat 90% 50%; +} + +/* Default list styling */ +#default_nav li:hover { + position: relative; + z-index: 200; +} + +#default_nav li:hover ul.default_sub { + left: 1px; + top: 26px; + background-color: #846add; + color: #fff; + white-space: nowrap; + width: auto; + height: auto; + z-index: 300; +} + +#default_nav li:hover ul.default_sub li { + display: block; + height: 23px; + position: relative; + float: left; + width: 90px; + text-align: left; + font-size: 11px; + font-weight: bold; +} + +#default_nav li:hover ul.default_sub li a { + display: block; + font-size: 11px; + height: 23px; + width: 90px; + background-color: #846add; + color: #fff; + line-height: 20px; + padding: 0 5px; + text-decoration: none; +} + +#default_nav li ul.default_sub li a.default_fly { + background: #e9e9e9 url(../images/arrow.gif) 80px 6px no-repeat; +} + +#default_nav li:hover ul.default_sub li a:hover { + background-color: #ddd; + color: #846add; +} + +#default_nav li:hover ul.default_sub li a.default_fly:hover { + background: #c6c7c9 url(../images/arrow_over.gif) 80px 6px no-repeat; + color: #fff; +} + +/*couleur des titres dans les menus d\xE9roul\xE9s*/ +#default_nav li b { + display: block; + font-size: 11px; + height: 18px; + width: 88px; + line-height: 18px; + margin-bottom: 3px; + text-indent: 6px; + color: #000; + border-bottom: 1px solid #000; + cursor: default; +} + +#default_nav li:hover li:hover ul,#default_nav li:hover li:hover li:hover ul,#default_nav li:hover li:hover li:hover li:hover ul,#default_nav li:hover li:hover li:hover li:hover li:hover ul + { + left: 90px; + top: -4px; + background: #e9e9e9; + padding: 3px; + border: 1px solid #0b4d97; + white-space: nowrap; + width: 90px; + z-index: 400; + height: auto; +} + +#default_nav ul,#default_nav li:hover ul ul,#default_nav li:hover li:hover ul ul,#default_nav li:hover li:hover li:hover ul ul,#default_nav li:hover li:hover li:hover li:hover ul ul + { + position: absolute; + left: -9999px; + top: -9999px; + width: 0; + height: 0; + margin: 0; + padding: 0; + list-style: none; +} + +#default_nav li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover li:hover li:hover a.default_fly + { + background: #c6c7c9 url(../images/arrow_over.gif) 80px 6px no-repeat; + color: #fff; + border-color: #fff; +} + +#default_nav li:hover li:hover li a.default_fly,#default_nav li:hover li:hover li:hover li a.default_fly,#default_nav li:hover li:hover li:hover li:hover li a.default_fly + { + background: #e9e9e9 url(../images/arrow.gif) 80px 6px no-repeat; + color: #000; + border-color: #e9e9e9; +} +/* +#xo-globalnav { + min-height: 28px; + margin: 0; + background: #846add url(../images/navbar-bg.png) repeat-x left bottom; + padding: 2px 0 0; + color: #fff; + font-size: 1.1em; + text-align: center; + list-style-type: none; +} +* html #xo-globalnav { + height: 28px; +} + +#xo-globalnav .x2-label { + display: none; +} + +#xo-globalnav li { + display: inline; + margin: 0; + padding-left: .5em; + padding-right: .5em; +} + +#xo-globalnav a { + background-color: inherit; + color: #fff; + text-decoration: none; +} + +#xo-globalnav a:hover { + background-color: inherit; + color: #b3aaec; + text-decoration: none; +}*/ Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_purple.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_purple.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_purple.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_purple.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_purple.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_white.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_white.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_white.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_white.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_down_white.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_over.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_over.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_over.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_over.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/arrow_over.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/index.html 2015-02-20 09:09:25 UTC (rev 13005) @@ -0,0 +1 @@ +<script>history.go(-1);</script> Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/navbar-bg.png =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/navbar-bg.png =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/navbar-bg.png 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/navbar-bg.png 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/images/navbar-bg.png ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/navbar-bg.png =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/pro_dropdown_3.css =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/pro_dropdown_3.css 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/pro_dropdown_3.css 2015-02-20 09:09:25 UTC (rev 13005) @@ -1,228 +0,0 @@ -/* ================================================================ -This copyright notice must be kept untouched in the stylesheet at -all times. - -The original version of this stylesheet and the associated (x)html -is available at http://www.stunicholls.com/menu/pro_dropdown_3.html -Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. -This stylesheet and the associated (x)html may be modified in any -way to fit your requirements. -=================================================================== */ -.default_preload1 { /*background: url(three_0a.gif);*/ - -} - -.default_preload2 { /*background: url(three_1a.gif);*/ - -} - -#default_nav { - padding: 0; - margin: 0; - height: 30px; - min-height: 30px; - background: #846add url(navbar-bg.png) repeat-x left bottom; - /*#846add*/ - color: #fff; - font-size: 1.1em; - text-align: center; - list-style-type: none; - position: relative; - z-index: 500; -} - -#default_nav li.default_top { - display: block; - float: left; -} - -#default_nav li a.default_top_link { - display: block; - float: left; - height: 23px; - line-height: 20px; - color: #fff; - text-decoration: none; - font-size: 11px; - font-weight: bold; - padding: 0 0 0 12px; - cursor: pointer; - /*background-color:#ddd;*/ /*background: url(three_0.gif);*/ -} - -#default_nav li a.default_top_link span { - float: left; - display: block; - padding: 0 24px 0 12px; - height: 23px; - /*background: url(three_0.gif) right top no-repeat;*/ -} - -#default_nav li a.default_top_link span.default_down { - float: left; - display: block; - padding: 0 24px 0 12px; - height: 23px; - background: url(arrow_down_white.gif) 90% 50% no-repeat; -} - -#default_nav li:hover a.default_top_link,#default_nav li a.default_selected - { - color: #846add; - background-color: #ddd; - border-bottom: 3px solid #846add; -} - -#default_nav li:hover a.default_top_link span,#default_nav li a.default_selected span - { - background-color: #ddd; -} - -#default_nav li:hover a.default_top_link span.default_down,#default_nav li a.default_selected span.default_down - { - background: #ddd url(arrow_down_purple.gif) no-repeat 90% 50%; -} - -/* Default list styling */ -#default_nav li:hover { - position: relative; - z-index: 200; -} - -#default_nav li:hover ul.default_sub { - left: 1px; - top: 26px; - background-color: #846add; - color: #fff; - white-space: nowrap; - width: auto; - height: auto; - z-index: 300; -} - -#default_nav li:hover ul.default_sub li { - display: block; - height: 23px; - position: relative; - float: left; - width: 90px; - text-align: left; - font-size: 11px; - font-weight: bold; -} - -#default_nav li:hover ul.default_sub li a { - display: block; - font-size: 11px; - height: 23px; - width: 90px; - background-color: #846add; - color: #fff; - line-height: 20px; - padding: 0 5px; - text-decoration: none; -} - -#default_nav li ul.default_sub li a.default_fly { - background: #e9e9e9 url(arrow.gif) 80px 6px no-repeat; -} - -#default_nav li:hover ul.default_sub li a:hover { - background-color: #ddd; - color: #846add; -} - -#default_nav li:hover ul.default_sub li a.default_fly:hover { - background: #c6c7c9 url(arrow_over.gif) 80px 6px no-repeat; - color: #fff; -} - -/*couleur des titres dans les menus d\xE9roul\xE9s*/ -#default_nav li b { - display: block; - font-size: 11px; - height: 18px; - width: 88px; - line-height: 18px; - margin-bottom: 3px; - text-indent: 6px; - color: #000; - border-bottom: 1px solid #000; - cursor: default; -} - -#default_nav li:hover li:hover ul,#default_nav li:hover li:hover li:hover ul,#default_nav li:hover li:hover li:hover li:hover ul,#default_nav li:hover li:hover li:hover li:hover li:hover ul - { - left: 90px; - top: -4px; - background: #e9e9e9; - padding: 3px; - border: 1px solid #0b4d97; - white-space: nowrap; - width: 90px; - z-index: 400; - height: auto; -} - -#default_nav ul,#default_nav li:hover ul ul,#default_nav li:hover li:hover ul ul,#default_nav li:hover li:hover li:hover ul ul,#default_nav li:hover li:hover li:hover li:hover ul ul - { - position: absolute; - left: -9999px; - top: -9999px; - width: 0; - height: 0; - margin: 0; - padding: 0; - list-style: none; -} - -#default_nav li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover li:hover li:hover a.default_fly - { - background: #c6c7c9 url(arrow_over.gif) 80px 6px no-repeat; - color: #fff; - border-color: #fff; -} - -#default_nav li:hover li:hover li a.default_fly,#default_nav li:hover li:hover li:hover li a.default_fly,#default_nav li:hover li:hover li:hover li:hover li a.default_fly - { - background: #e9e9e9 url(arrow.gif) 80px 6px no-repeat; - color: #000; - border-color: #e9e9e9; -} -/* -#xo-globalnav { - min-height: 28px; - margin: 0; - background: #846add url(../img/navbar-bg.png) repeat-x left bottom; - padding: 2px 0 0; - color: #fff; - font-size: 1.1em; - text-align: center; - list-style-type: none; -} -* html #xo-globalnav { - height: 28px; -} - -#xo-globalnav .x2-label { - display: none; -} - -#xo-globalnav li { - display: inline; - margin: 0; - padding-left: .5em; - padding-right: .5em; -} - -#xo-globalnav a { - background-color: inherit; - color: #fff; - text-decoration: none; -} - -#xo-globalnav a:hover { - background-color: inherit; - color: #b3aaec; - text-decoration: none; -}*/ Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/skin_version.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/skin_version.php 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/default/skin_version.php 2015-02-20 09:09:25 UTC (rev 13005) @@ -19,6 +19,6 @@ */ $skinversion['template'] = 'templates/template.tpl'; -$skinversion['css'] = array('pro_dropdown_3.css'); +$skinversion['css'] = array('css/pro_dropdown_3.css'); $skinversion['js'] = array('stuHover.js'); $skinversion['prefix'] = 'sf'; Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/arrow.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/arrow_over.gif =================================================================== (Binary files differ) Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/css/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/css/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/css/index.html 2015-02-20 09:09:25 UTC (rev 13005) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/css/pro_dropdown_3.css =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/css/pro_dropdown_3.css (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/css/pro_dropdown_3.css 2015-02-20 09:09:25 UTC (rev 13005) @@ -0,0 +1,184 @@ +/* ================================================================ +This copyright notice must be kept untouched in the stylesheet at +all times. + +The original version of this stylesheet and the associated (x)html +is available at http://www.stunicholls.com/menu/pro_dropdown_3.html +Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. +This stylesheet and the associated (x)html may be modified in any +way to fit your requirements. +=================================================================== */ +.preload1 { + background: url(../images/three_0a.gif); +} + +.preload2 { + background: url(../images/three_1a.gif); +} + +#nav { + padding: 0; + margin: 0; + list-style: none; + height: 38px; + background: #fff url(../images/three_0.gif) repeat-x; + position: relative; + z-index: 500; + font-family: arial, verdana, sans-serif; +} + +#nav li.top { + display: block; + float: left; +} + +#nav li a.top_link { + display: block; + float: left; + height: 35px; + line-height: 33px; + color: #ccc; + text-decoration: none; + font-size: 11px; + font-weight: bold; + padding: 0 0 0 12px; + cursor: pointer; + background: url(../images/three_0.gif); +} + +#nav li a.top_link span { + float: left; + display: block; + padding: 0 24px 0 12px; + height: 35px; + background: url(../images/three_0.gif) right top no-repeat; +} + +#nav li a.top_link span.down { + float: left; + display: block; + padding: 0 24px 0 12px; + height: 35px; + background: url(../images/three_0a.gif) no-repeat right top; +} + +#nav li:hover a.top_link,#nav li a.selected { + color: #fff; + background: url(../images/three_1.gif) no-repeat; +} + +#nav li:hover a.top_link span,#nav li a.selected span { + background: url(../images/three_1.gif) no-repeat right top; +} + +#nav li:hover a.top_link span.down,#nav li a.selected span.down { + background: url(../images/three_1a.gif) no-repeat right top; + padding-bottom: 3px; +} + +/* Default list styling */ +#nav li:hover { + position: relative; + z-index: 200; +} + +#nav li:hover ul.sub { + left: 1px; + top: 38px; + background: #e9e9e9; + padding: 3px; + border: 1px solid #0b4d97; + white-space: nowrap; + width: 90px; + height: auto; + z-index: 300; +} + +#nav li:hover ul.sub li { + display: block; + height: 20px; + position: relative; + float: left; + width: 90px; + font-weight: normal; +} + +#nav li:hover ul.sub li a { + display: block; + font-size: 11px; + height: 18px; + width: 88px; + line-height: 18px; + text-indent: 5px; + color: #000; + text-decoration: none; + border: 1px solid #e9e9e9; +} + +#nav li ul.sub li a.fly { + background: #e9e9e9 url(../images/arrow.gif) 80px 6px no-repeat; +} + +#nav li:hover ul.sub li a:hover { + background: #c6c7c9; + color: #fff; + border-color: #fff; +} + +#nav li:hover ul.sub li a.fly:hover { + background: #c6c7c9 url(../images/arrow_over.gif) 80px 6px no-repeat; + color: #fff; +} + +/*couleur des titres dans les menus d\xE9roul\xE9s*/ +#nav li b { + display: block; + font-size: 11px; + height: 18px; + width: 88px; + line-height: 18px; + margin-bottom: 3px; + text-indent: 6px; + color: #000; + border-bottom: 1px solid #000; + cursor: default; +} + +#nav li:hover li:hover ul,#nav li:hover li:hover li:hover ul,#nav li:hover li:hover li:hover li:hover ul,#nav li:hover li:hover li:hover li:hover li:hover ul + { + left: 90px; + top: -4px; + background: #e9e9e9; + padding: 3px; + border: 1px solid #0b4d97; + white-space: nowrap; + width: 90px; + z-index: 400; + height: auto; +} + +#nav ul,#nav li:hover ul ul,#nav li:hover li:hover ul ul,#nav li:hover li:hover li:hover ul ul,#nav li:hover li:hover li:hover li:hover ul ul + { + position: absolute; + left: -9999px; + top: -9999px; + width: 0; + height: 0; + margin: 0; + padding: 0; + list-style: none; +} + +#nav li:hover li:hover a.fly,#nav li:hover li:hover li:hover a.fly,#nav li:hover li:hover li:hover li:hover a.fly,#nav li:hover li:hover li:hover li:hover li:hover a.fly + { + background: #c6c7c9 url(../images/arrow_over.gif) 80px 6px no-repeat; + color: #fff; + border-color: #fff; +} + +#nav li:hover li:hover li a.fly,#nav li:hover li:hover li:hover li a.fly,#nav li:hover li:hover li:hover li:hover li a.fly + { + background: #e9e9e9 url(../images/arrow.gif) 80px 6px no-repeat; + color: #000; + border-color: #e9e9e9; +} Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow_over.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow_over.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow_over.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow_over.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/arrow_over.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/index.html 2015-02-20 09:09:25 UTC (rev 13005) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0a.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0a.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0a.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0a.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_0a.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1a.gif =================================================================== (Binary files differ) Index: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1a.gif =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1a.gif 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1a.gif 2015-02-20 09:09:25 UTC (rev 13005) Property changes on: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/images/three_1a.gif ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/pro_dropdown_3.css =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/pro_dropdown_3.css 2015-02-20 05:05:11 UTC (rev 13004) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/mamba/mymenus/skins/multiblack/pro_dropdown_3.css 2015-02-20 09:09:25 UTC (rev 13005) @@ -1,184 +0,0 @@ -/* ================================================================ -This copyright notice must be kept untouched in the stylesheet at -all times. - -The original version of this stylesheet and the associated (x)html -is available at http://www.stunicholls.com/menu/pro_dropdown_3.html -Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. -This stylesheet and the associated (x)html may be modified in any -way to fit your requirements. -=================================================================== */ -.preload1 { - background: url(three_0a.gif); -} - -.preload2 { - background: url(three_1a.gif); -} - -#nav { - padding: 0; - margin: 0; - list-style: none; - height: 38px; - background: #fff url(three_0.gif)... [truncated message content] |
From: <zy...@us...> - 2015-02-20 05:05:20
|
Revision: 13004 http://sourceforge.net/p/xoops/svn/13004 Author: zyspec Date: 2015-02-20 05:05:11 +0000 (Fri, 20 Feb 2015) Log Message: ----------- * minor PSRx naming convention updates * minor XOOPS variable name updates for consistency * minor template CSS changes Modified Paths: -------------- XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_footer.php XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_header.php XoopsModules/randomquote/branches/zyspec/randomquote/admin/main.php XoopsModules/randomquote/branches/zyspec/randomquote/admin/menu.php XoopsModules/randomquote/branches/zyspec/randomquote/class/quotes.php XoopsModules/randomquote/branches/zyspec/randomquote/docs/changelog.txt XoopsModules/randomquote/branches/zyspec/randomquote/header.php XoopsModules/randomquote/branches/zyspec/randomquote/include/action.module.php XoopsModules/randomquote/branches/zyspec/randomquote/include/functions.php XoopsModules/randomquote/branches/zyspec/randomquote/include/plugin.tag.php XoopsModules/randomquote/branches/zyspec/randomquote/include/search.inc.php XoopsModules/randomquote/branches/zyspec/randomquote/index.php XoopsModules/randomquote/branches/zyspec/randomquote/xoops_version.php Modified: XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_footer.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_footer.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_footer.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -24,10 +24,10 @@ */ echo "<div class='adminfooter'>\n" - . " <div class='center'>\n" + . " <div class='txtcenter'>\n" . " <a href='" . $GLOBALS['xoopsModule']->getInfo('author_website_url') . "' target='_blank'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='" . $GLOBALS['xoopsModule']->getInfo('author_website_name') . "' title='" . $GLOBALS['xoopsModule']->getInfo('author_website_name') . "' /></a>\n" . " </div>\n" - . " <div class='center smallsmall italic pad5'>\n" + . " <div class='txtcenter smallsmall italic pad5'>\n" . " " . _AM_RANDOMQUOTE_MAINTAINED_BY . " <a class='tooltip' rel='external' href='http://" . $GLOBALS['xoopsModule']->getInfo('module_website_url') . "' " . "title='" . _AM_RANDOMQUOTE_MAINTAINED_TITLE . "'>" . _AM_RANDOMQUOTE_MAINTAINED_TEXT . "</a>\n" Modified: XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_header.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_header.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/admin/admin_header.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -23,21 +23,21 @@ * @since 2.0.0 */ -$thisDirname = basename(dirname(__DIR__)); +$moduleDirname = basename(dirname(__DIR__)); include_once dirname(dirname(dirname(__DIR__))) . '/mainfile.php'; include_once $GLOBALS['xoops']->path('/include/cp_header.php'); -//include_once $GLOBALS['xoops']->path("modules/{$thisDirname}/include/config.php"); -include_once $GLOBALS['xoops']->path("modules/{$thisDirname}/include/functions.php"); +//include_once $GLOBALS['xoops']->path("modules/{$moduleDirname}/include/config.php"); +include_once $GLOBALS['xoops']->path("modules/{$moduleDirname}/include/functions.php"); -XoopsLoad::load('xoopsrequest'); -XoopsLoad::load('quotes', $thisDirname); -XoopsLoad::load('constants', $thisDirname); +XoopsLoad::load('XoopsRequest'); +XoopsLoad::load('quotes', $moduleDirname); +XoopsLoad::load('constants', $moduleDirname); $pathIcon16 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons16')); $pathIcon32 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons32')); $pathModuleAdmin = $GLOBALS['xoops']->path('www/' . $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin')); -$quotesHandler =& xoops_getModuleHandler('quotes', $thisDirname); +$quotesHandler =& xoops_getModuleHandler('quotes', $moduleDirname); $myts =& MyTextSanitizer::getInstance(); if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) { @@ -48,9 +48,9 @@ $GLOBALS['xoopsTpl']->assign('pathIcon16', $pathIcon16); $GLOBALS['xoopsTpl']->assign('pathIcon32', $pathIcon32); //Load languages -xoops_loadLanguage('admin', $thisDirname); -xoops_loadLanguage('modinfo', $thisDirname); -xoops_loadLanguage('main', $thisDirname); +xoops_loadLanguage('admin', $moduleDirname); +xoops_loadLanguage('modinfo', $moduleDirname); +xoops_loadLanguage('main', $moduleDirname); require_once "{$pathModuleAdmin}/moduleadmin/moduleadmin.php"; xoops_cp_header(); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/admin/main.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/admin/main.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/admin/main.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -25,10 +25,8 @@ include_once __DIR__ . '/admin_header.php'; -//xoops_load('xoopsrequest'); +$op = XoopsRequest::getCmd('op', ''); -$op = XoopsRequest::getCmd('op', ''); -//$op = cleanVarsRandomquote($_REQUEST, 'op', '', 'string'); switch ($op) { case "list": default: @@ -45,20 +43,20 @@ $criteria->setOrder('ASC'); $quotesObjArray = $quotesHandler->getAll($criteria); $quoteCount = (!empty($quotesObjArray) ? count($quotesObjArray) : 0); -// $quoteCount = $quotesHandler->getCount(); //Table view if ($quoteCount) { - echo "<table class='width100 outer' cellspacing='1'>\n" - . " <thead>\n" + echo "\n" + . "<table class='outer width100 bspacing1'>\n" + . "<thead>\n" . " <tr>\n" . " <th class='txtcenter'>" . _AM_RANDOMQUOTE_QUOTES_QUOTE . "</th>\n" . " <th class='txtcenter'>" . _AM_RANDOMQUOTE_QUOTES_AUTHOR . "</th>\n" . " <th class='txtcenter'>" . _AM_RANDOMQUOTE_QUOTES_STATUS . "</th>\n" . " <th class='txtcenter width10'>" . _AM_RANDOMQUOTE_FORMACTION . "</th>\n" . " </tr>\n" - . " </thead>\n" - . " <tbody>\n"; + . "</thead>\n" + . "<tbody>\n"; $class = 'even'; @@ -83,7 +81,7 @@ . " </td>\n" . " </tr>\n"; } - echo " </tbody>\n" + echo "</tbody>\n" . "</table><br /><br />\n"; } @@ -135,11 +133,11 @@ ); if ($objId = $quotesHandler->insert($obj)) { -// $module_handler =& xoops_gethandler('module'); +// $moduleHandler =& xoops_gethandler('module'); $tagModule =& XoopsModule::getByDirname('tag'); if (($tagModule instanceof XoopsModule) && ($tagModule->isactive())) { - $tag_handler =& xoops_getmodulehandler('tag', 'tag'); - $tag_handler->updateByItem($input->item_tag, $objId, $thisDirname, 0); + $tagHandler =& xoops_getmodulehandler('tag', 'tag'); + $tagHandler->updateByItem($input->item_tag, $objId, $thisDirname, 0); } redirect_header("main.php?op=list", RandomquoteConstants::REDIRECT_DELAY_MEDIUM, $add_msg); } @@ -185,11 +183,11 @@ $item_id = $obj->getVar('id'); if ($quotesHandler->delete($obj)) { // now clear out items in tag module for this item - $module_handler =& xoops_gethandler('module'); + $moduleHandler =& xoops_gethandler('module'); $tagModule =& XoopsModule::getByDirname('tag'); if (($tagModule instanceof XoopsModule) && ($tagModule->isactive())) { - $tag_handler =& xoops_getmodulehandler('tag', 'tag'); - $tag_handler->updateByItem(array(), $item_id, $thisDirname); //clear all tags for this item + $tagHandler =& xoops_getmodulehandler('tag', 'tag'); + $tagHandler->updateByItem(array(), $item_id, $thisDirname); //clear all tags for this item } redirect_header($_SERVER['PHP_SELF'], RandomquoteConstants::REDIRECT_DELAY_MEDIUM, _AM_RANDOMQUOTE_FORMDELOK); } else { Modified: XoopsModules/randomquote/branches/zyspec/randomquote/admin/menu.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/admin/menu.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/admin/menu.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -23,21 +23,21 @@ * @since 2.0.0 */ -$dirname = basename(dirname(__DIR__)); -$module_handler =& xoops_gethandler("module"); -$xoopsModule =& XoopsModule::getByDirname($dirname); -$moduleInfo =& $module_handler->get($xoopsModule->getVar("mid")); -$pathIcon32 = '../../' . $moduleInfo->getInfo('icons32'); +$moduleDirname = basename(dirname(__DIR__)); +$moduleHandler =& xoops_gethandler("module"); +$xoopsModule =& XoopsModule::getByDirname($moduleDirname); +$moduleInfo =& $moduleHandler->get($xoopsModule->getVar("mid")); +$pathIcon32 = '../../' . $moduleInfo->getInfo('icons32'); -$adminmenu = array(array("title" => _MI_RANDOMQUOTE_ADMENU1, - "link" => 'admin/index.php', - "icon" => "{$pathIcon32}/home.png"), +$adminmenu = array(array('title' => _MI_RANDOMQUOTE_ADMENU1, + 'link' => 'admin/index.php', + 'icon' => "{$pathIcon32}/home.png"), - array("title" => _MI_RANDOMQUOTE_ADMENU2, - "link" => 'admin/main.php', - "icon" => "{$pathIcon32}/content.png"), + array('title' => _MI_RANDOMQUOTE_ADMENU2, + 'link' => 'admin/main.php', + 'icon' => "{$pathIcon32}/content.png"), - array("title" => _MI_RANDOMQUOTE_ADMENU3, - "link" => 'admin/about.php', - "icon" => "{$pathIcon32}/about.png") + array('title' => _MI_RANDOMQUOTE_ADMENU3, + 'link' => 'admin/about.php', + 'icon' => "{$pathIcon32}/about.png") ); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/class/quotes.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/class/quotes.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/class/quotes.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -99,17 +99,17 @@ * load the formtag class * display the tag form element to collect the tag item */ - $module_handler =& xoops_gethandler('module'); - $tagModule =& XoopsModule::getByDirname('tag'); + $moduleHandler =& xoops_gethandler('module'); + $tagModule =& XoopsModule::getByDirname('tag'); if (($tagModule instanceof XoopsModule) && ($tagModule->isactive())) { $tagClassExists = XoopsLoad::load('formtag', 'tag'); // get the TagFormTag class if ($tagClassExists) { if ($this->isNew()) { $tag_items = array(); } else { - $moduleMid = $GLOBALS['xoopsModule']->mid(); - $tag_handler =& xoops_getmodulehandler('tag', 'tag'); - $tag_items = $tag_handler->getByItem($id, $moduleMid, 0); + $moduleMid = $GLOBALS['xoopsModule']->mid(); + $tagHandler =& xoops_getmodulehandler('tag', 'tag'); + $tag_items = $tagHandler->getByItem($id, $moduleMid, 0); } $tag_string = implode('|', $tag_items); $form->addElement(new TagFormTag('item_tag', 60, 255, $tag_string, 0)); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/docs/changelog.txt =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/docs/changelog.txt 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/docs/changelog.txt 2015-02-20 05:05:11 UTC (rev 13004) @@ -1,4 +1,4 @@ -<u>Version 2.1 Beta 2 from 2015-1-28</u> +<u>Version 2.1 Beta 2 from 2015-2-10</u> - added breadcrumb display to top of index page - improved index.tpl rendering - changed to allow HTML in quote entry (XoopsRequest::getText) in admin @@ -7,6 +7,8 @@ - fixed bug where 'item_tag' wasn't correctly assigned to template in /class/quotes.php - fixed bug in install script PHP version checking - fixed bug where language file wasn't being loaded in install script +- improved PSRx naming nomenclature +- removed cleanVarsRandomquote function since it was deprecated in Beta 1 <u>Version 2.1 Beta 1 from 2014-12-08</u> - require PHP 5.3 Modified: XoopsModules/randomquote/branches/zyspec/randomquote/header.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/header.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/header.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -20,14 +20,14 @@ */ include dirname(dirname(__DIR__)) . '/mainfile.php'; -$dirname = $GLOBALS['xoopsModule']->getVar('dirname'); -//include $GLOBALS['xoops']->path("/modules/{$dirname}/include/config.php"); -include $GLOBALS['xoops']->path("/modules/{$dirname}/include/functions.php"); +$moduleDirname = $GLOBALS['xoopsModule']->getVar('dirname'); +//include $GLOBALS['xoops']->path("/modules/{$moduleDirname}/include/config.php"); +include $GLOBALS['xoops']->path("/modules/{$moduleDirname}/include/functions.php"); //$myts =& MyTextSanitizer::getInstance(); -$style = "modules/{$dirname}/include/style.css"; +$style = "modules/{$moduleDirname}/include/style.css"; if (file_exists($GLOBALS['xoops']->path($style))) { $GLOBALS['xoTheme']->addStylesheet($GLOBALS['xoops']->url("www/{$stylesheet}")); } -$quotesHandler =& xoops_getModuleHandler('quotes', $dirname); -xoops_loadLanguage('modinfo', $dirname); -xoops_loadLanguage('main', $dirname); +$quotesHandler =& xoops_getModuleHandler('quotes', $moduleDirname); +xoops_loadLanguage('modinfo', $moduleDirname); +xoops_loadLanguage('main', $moduleDirname); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/include/action.module.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/include/action.module.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/include/action.module.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -29,7 +29,7 @@ if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof XoopsUser) - || !($GLOBALS['xoopsUser']->IsAdmin())) + || !($GLOBALS['xoopsUser']->isAdmin())) { exit("Restricted access" . PHP_EOL); } @@ -163,7 +163,7 @@ { /* Do some synchronization with tags to remove tags associated with this module * - * @todo: write this code... + * @TODO: write this code... * * pseudo code * if (tag module installed) { @@ -177,8 +177,8 @@ $tagModule =& XoopsModule::getByDirname('tag'); if (($tagModule instanceof XoopsModule) && ($tagModule->isactive())) { // first delete all quotes - $quotes_handler =& xoops_getmodulehandler('quotes', 'randomquote'); - $quoteObjs = $quotes_handler->deleteAll(); + $quotesHandler =& xoops_getmodulehandler('quotes', 'randomquote'); + $quoteObjs = $quotesHandler->deleteAll(); //now 'unlink' the quote tags from Tag modules include_once $GLOBALS['xoops']->path("/modules/tag/include/functions.recon.php"); $success = tag_synchronization(); Modified: XoopsModules/randomquote/branches/zyspec/randomquote/include/functions.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/include/functions.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/include/functions.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -44,36 +44,6 @@ /** * - * Enter description here ... - * - * @deprecated Replaced by XoopsRequest - * @param string $global ($_POST, $_GET, $_REQUEST, etc) - * @param string $key input var - * @param unknown_type $default set $key to this if invalid input - * @param string $type types are 'int' or 'string' - * - * @return unknown_type cleaned input value contained in $global[$key] - */ -function cleanVarsRandomquote(&$global, $key, $default = '', $type = 'int') -{ - switch ($type) { - case 'string': - $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_MAGIC_QUOTES) : $default; - break; - case 'int': - default: - $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_NUMBER_INT) : $default; - break; - } - if ($ret === false) { - return $default; - } - - return $ret; -} - -/** - * * Assign the xoops_meta_keywords in the template * * @param string $content a string of keywords for HTML meta tag Modified: XoopsModules/randomquote/branches/zyspec/randomquote/include/plugin.tag.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/include/plugin.tag.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/include/plugin.tag.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -52,8 +52,8 @@ $criteria->add(new Criteria("id", "(" . implode(",", $items_id) . ")", "IN")); $criteria->add(new Criteria('quote_status', RandomquoteConstants::STATUS_ONLINE)); - $quote_handler =& xoops_getmodulehandler('quotes', 'randomquote'); - $quoteObjs = $quote_handler->getObjects($criteria, true); + $quoteHandler =& xoops_getmodulehandler('quotes', 'randomquote'); + $quoteObjs = $quoteHandler->getObjects($criteria, true); foreach ($cats_id as $cat_id) { foreach ($items_id as $item_id) { @@ -80,29 +80,29 @@ function mymodule_tag_synchronization($mid) { xoops_load('constants', 'randomquote'); - $item_handler =& xoops_getmodulehandler('quotes', 'randomquote'); - $link_handler =& xoops_getmodulehandler('link', 'tag'); + $itemHandler =& xoops_getmodulehandler('quotes', 'randomquote'); + $linkHandler =& xoops_getmodulehandler('link', 'tag'); - if (!$item_handler || !$link_handler) { + if (!$itemHandler || !$linkHandler) { $result = false; } else { $mid = XoopsFilterInput::clean($mid, 'INT'); - $module_handler =& xoops_gethandler('module'); - $rqModule =& XoopsModule::getByDirname('randomquote'); + $moduleHandler =& xoops_gethandler('module'); + $rqModule =& XoopsModule::getByDirname('randomquote'); // check to make sure module is active and trying to sync randomquote if (($rqModule instanceof XoopsModule) && ($rqModule->isactive()) && ($rqModule->mid() == $mid)) { // clear tag-item links - $sql = "DELETE FROM {$link_handler->table}" + $sql = "DELETE FROM {$linkHandler->table}" . " WHERE tag_modid = {$mid}" . " AND " . " (tag_itemid NOT IN " - . " (SELECT DISTINCT {$item_handler->keyName} " - . " FROM {$item_handler->table} " - . " WHERE {$item_handler->table}.quote_status = " . RandomquoteConstants::STATUS_ONLINE + . " (SELECT DISTINCT {$itemHandler->keyName} " + . " FROM {$itemHandler->table} " + . " WHERE {$itemHandler->table}.quote_status = " . RandomquoteConstants::STATUS_ONLINE . " )" . " )"; - $result = $link_handler->db->queryF($sql); + $result = $linkHandler->db->queryF($sql); } else { $result = false; } Modified: XoopsModules/randomquote/branches/zyspec/randomquote/include/search.inc.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/include/search.inc.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/include/search.inc.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -30,7 +30,7 @@ if (0 != (int) $userid) { return $ret; } - $quote_handler =& xoops_getmodulehandler('quotes', 'randomquote'); + $quoteHandler =& xoops_getmodulehandler('quotes', 'randomquote'); $entryFields = array('id', 'quote', 'author', 'create_date'); $criteria = new CriteriaCompo(); $criteria->add(new Criteria('quote_status', RandomquoteConstants::STATUS_ONLINE)); @@ -49,7 +49,7 @@ $criteria->add(new Criteria('author', "%{$query}%", 'LIKE'), 'OR'); } } - $quoteObjs = $quote_handler->getAll($criteria, $entryFields); + $quoteObjs = $quoteHandler->getAll($criteria, $entryFields); foreach ($quoteObjs as $thisQuote) { $ret[] = array ( 'image' => 'assets/images/icons/quote.png', Modified: XoopsModules/randomquote/branches/zyspec/randomquote/index.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/index.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/index.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -59,7 +59,7 @@ //$numrows = $quotesHandler->getCount(); //Table view if ($numrows) { - $bodyTxt = "<table class='width100 outer' cellspacing='1'>\n" + $bodyTxt = "<table class='outer width100 outer bspacing1'>\n" . " <thead>\n" . " <tr>\n" . " <th class='txtcenter'>" . _MA_RANDOMQUOTE_QUOTES_QUOTE . "</th>\n" Modified: XoopsModules/randomquote/branches/zyspec/randomquote/xoops_version.php =================================================================== --- XoopsModules/randomquote/branches/zyspec/randomquote/xoops_version.php 2015-02-20 04:45:42 UTC (rev 13003) +++ XoopsModules/randomquote/branches/zyspec/randomquote/xoops_version.php 2015-02-20 05:05:11 UTC (rev 13004) @@ -6,8 +6,6 @@ * of supporting developers from this source code or any supporting source code * which is considered copyrighted (c) material of the original comment or credit authors. * - * PHP version 5 - * * @category Module * @package randomquote * @author XOOPS Development Team @@ -21,11 +19,11 @@ // defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined'); -$dirname = basename(__DIR__); +$moduleDirname = basename(__DIR__); xoops_load('XoopsLists'); xoops_load('xoopseditorhandler'); -$editor_handler = XoopsEditorHandler::getInstance(); +$editorHandler = XoopsEditorHandler::getInstance(); $modversion = array('name' => _MI_RANDOMQUOTE_ADMIN_NAME, 'description' => _MI_RANDOMQUOTE_ADMIN_DESC, @@ -47,13 +45,13 @@ 'link' => 'page=module_index')), 'manual' => "Install.txt", - 'manual_file' => XOOPS_URL . "/modules/{$dirname}/docs/link to manual file", + 'manual_file' => XOOPS_URL . "/modules/{$moduleDirname}/docs/link to manual file", 'min_php' => "5.3.7", 'min_xoops' => "2.5.7", 'min_admin' => "1.2", 'min_db' => array('mysql' => '5.0.7', 'mysqli' => '5.0.7'), 'image' => "assets/images/randomquote_logo.png", - 'dirname' => "{$dirname}", + 'dirname' => "{$moduleDirname}", 'dirmoduleadmin' => 'Frameworks/moduleclasses', 'icons16' => 'Frameworks/moduleclasses/icons/16', @@ -61,7 +59,7 @@ //About 'release_info' => "module_release_info", - 'release_file' => XOOPS_URL . "/modules/{$dirname}/docs/module_release_info file", + 'release_file' => XOOPS_URL . "/modules/{$moduleDirname}/docs/module_release_info file", 'demo_site_url' => "http://xoops.org", 'demo_site_name' => "XOOPS Demo Site", 'forum_site_url' => "http://xoops.org", @@ -138,7 +136,7 @@ 'formtype' => "select", 'valuetype' => "text", 'default' => "dhtml", - 'options' => array_flip($editor_handler->getList())), + 'options' => array_flip($editorHandler->getList())), array('name' => "keywords", 'title' => "_MI_RANDOMQUOTE_KEYWORDS", |
From: <zy...@us...> - 2015-02-20 04:45:45
|
Revision: 13003 http://sourceforge.net/p/xoops/svn/13003 Author: zyspec Date: 2015-02-20 04:45:42 +0000 (Fri, 20 Feb 2015) Log Message: ----------- * change to use XOOPS jquery js from Frameworks * cleaned up skins directories to use common structure (/css, /images) * fixed bug in rendering menucss in block * added tw_red skin, inadvertently removed in previous release * added mid KEY for SQL to improve performance for common queries * normalized icons16 & icons32 definitions similar to other XOOPS modules * more code cleanup Modified Paths: -------------- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/admin/admin_header.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/admin/menu.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/blocks/mymenus_block.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/docs/changelog.txt XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/bootstrap/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/clean/templates/template.tpl XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/mainmenu/templates/template.tpl XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/superfish/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/superfish_navbar/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_blue/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/sql/mysql.sql XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/xoops_version.php Added Paths: ----------- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/css/style.css XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/css/pro_dropdown_3.css XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/arrow.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/arrow_down_purple.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/arrow_down_white.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/arrow_over.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/navbar-bg.png XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/css/pro_dropdown_3.css XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/arrow.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/arrow_over.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/three_0.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/three_0a.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/three_1.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/three_1a.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_blue/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_blue/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_blue/css/tw_blue.css XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/css/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/css/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/css/tw_red.css XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/menu_left.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/menu_mid.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/menu_right.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/nav-bg.png XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/split.png XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/submenu_bg.png XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/submenu_bottom.png XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/images/submenu_top.png XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/skin_version.php XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/templates/ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/templates/index.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/templates/template.html XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_red/templates/template.tpl Removed Paths: ------------- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/style.css XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow_down_purple.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow_down_white.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow_over.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/navbar-bg.png XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/pro_dropdown_3.css XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/arrow.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/arrow_over.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/pro_dropdown_3.css XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_0.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_0a.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_1.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_1a.gif XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/tw_blue/tw_blue.css Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/admin/admin_header.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/admin/admin_header.php 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/admin/admin_header.php 2015-02-20 04:45:42 UTC (rev 13003) @@ -27,8 +27,8 @@ //global $xoopsModule; $moduleInfo = $module_handler->get($xoopsModule->getVar('mid')); -$pathIcon16 = '../'.$xoopsModule->getInfo('icons16'); -$pathIcon32 = '../'.$xoopsModule->getInfo('icons32'); +$pathIcon16 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons16')); +$pathIcon32 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons32')); $indexAdmin = new ModuleAdmin(); Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/admin/menu.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/admin/menu.php 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/admin/menu.php 2015-02-20 04:45:42 UTC (rev 13003) @@ -23,7 +23,7 @@ $dirname = basename(dirname(__DIR__)); $module_handler = xoops_gethandler('module'); $module = $module_handler->getByDirname($dirname); -$pathIcon32 = $module->getInfo('icons32'); +$pathIcon32 = '../../' . $module->getInfo('icons32'); xoops_loadLanguage('admin', $dirname); Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/blocks/mymenus_block.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/blocks/mymenus_block.php 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/blocks/mymenus_block.php 2015-02-20 04:45:42 UTC (rev 13003) @@ -8,17 +8,16 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ - /** - * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/ - * @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License + * @copyright {@link http://sourceforge.net/projects/xoops/ The XOOPS Project} + * @license {@link http://www.gnu.org/licenses/gpl-2.0.html GNU Public License} * @package Mymenus * @since 1.0 * @author trabis <lus...@gm...> * @version $Id$ */ -defined('XOOPS_ROOT_PATH') or exit("Restricted access"); +defined('XOOPS_ROOT_PATH') || exit("Restricted access"); /** * @param $options @@ -29,7 +28,7 @@ { $block = array(); global $xoTheme, $xoopsLogger; - $xoopsLogger->startTime('My Menus Block'); + $xoopsLogger->startTime('MyMenus Block'); $myts =& MyTextSanitizer::getInstance(); include_once $GLOBALS['xoops']->path('modules/mymenus/include/functions.php'); @@ -38,17 +37,17 @@ include_once $GLOBALS['xoops']->path('modules/mymenus/class/builder.php'); $registry =& MymenusRegistry::getInstance(); - $plugin =& MymenusPlugin::getInstance(); + $plugin =& MymenusPlugin::getInstance(); $plugin->triggerEvent('Boot'); - $menu_id = $options[0]; + $menuId = $options[0]; - $this_handler =& xoops_getModuleHandler('links', 'mymenus'); - $criteria = new CriteriaCompo(new Criteria('mid', $menu_id)); + $linksHandler =& xoops_getModuleHandler('links', 'mymenus'); + $criteria = new CriteriaCompo(new Criteria('mid', $menuId)); $criteria->setSort('weight'); $criteria->setOrder('ASC'); //get menus as an array with ids as keys - $menus = $this_handler->getAll($criteria, null, false, false); + $menus = $linksHandler->getAll($criteria, null, false, false); unset($criteria); foreach ($menus as $key => $links) { @@ -78,84 +77,84 @@ $menus = $registry->getEntry('menus'); $builder = new MymenusBuilder($menus); - $block = $builder->render(); + $block = $builder->render(); /*--------------------------------------------------------------*/ //default files to load - $css = array(); - $js = array(); + $cssArray = array(); + $jsArray = array(); //get extra files from skins - $skin = $options[1]; - $skin_info = mymenus_getSkinInfo($skin, $options[2], $options[3]); + $skin = $options[1]; + $skinInfo = mymenus_getSkinInfo($skin, $options[2], $options[3]); - if (isset($skin_info['css'])) { - $css = array_merge($css, $skin_info['css']); + if (isset($skinInfo['css'])) { + $cssArray = array_merge($cssArray, $skinInfo['css']); } - if (isset($skin_info['js'])) { - $js = array_merge($js, $skin_info['js']); + if (isset($skinInfo['js'])) { + $jsArray = array_merge($jsArray, $skinInfo['js']); } $config = mymenus_getModuleConfig(); if ('xoopstpl' == $config['assign_method']) { $tpl_vars = ''; - foreach ($css as $file) { - $tpl_vars .= "\n" . '<link rel="stylesheet" type="text/css" media="all" href="' . $file . '" />'; + foreach ($cssArray as $file) { + $tpl_vars .= "\n<link rel='stylesheet' type='text/css' media='all' href='{$file}' />"; } - foreach ($js as $file) { - $tpl_vars .= "\n" . '<script type="text/javascript" src="' . $file . '"></script>'; + foreach ($jsArray as $file) { + $tpl_vars .= "\n<script type='text/javascript' src='{$file}'></script>"; } - if (isset($skin_info['header'])) { - $tpl_vars .= "\n" . $skin_info['header']; + if (isset($skinInfo['header'])) { + $tpl_vars .= "\n{$skinInfo['header']}"; } $GLOBALS['xoopsTpl']->assign('xoops_module_header' , $tpl_vars . @$GLOBALS['xoopsTpl']->get_template_vars("xoops_module_header")); } else { - foreach ($css as $file) { + foreach ($cssArray as $file) { $xoTheme->addStylesheet($file); } - foreach ($js as $file) { + foreach ($jsArray as $file) { $xoTheme->addScript($file); } - if (isset($skin_info['header'])) { - $GLOBALS['xoopsTpl']->assign('xoops_footer' , @$GLOBALS['xoopsTpl']->get_template_vars("xoops_footer") . "\n" . $skin_info['header']); + if (isset($skinInfo['header'])) { + $GLOBALS['xoopsTpl']->assign('xoops_footer' , @$GLOBALS['xoopsTpl']->get_template_vars("xoops_footer") . "\n" . $skinInfo['header']); } } $blockTpl = new XoopsTpl(); - $blockTpl->assign('block', $block); - $blockTpl->assign('config', $skin_info['config']); - $blockTpl->assign('skinurl', $skin_info['url']); - $blockTpl->assign('skinpath', $skin_info['path']); + $blockTpl->assign(array('block' => $block, + 'config' => $skinInfo['config'], + 'skinurl' => $skinInfo['url'], + 'skinpath' => $skinInfo['path'], + 'xlanguage' => xoops_isActiveModule('xlanguage') ? true : false) // xLanguage check + ); - // xLanguage check - if (xoops_isActiveModule('xlanguage')) { - $blockTpl->assign('xlanguage', true); - } + /*assign ul class*/ + $menuCss = ''; + $menusHandler = xoops_getModuleHandler('menus', 'mymenus'); + $menuCriteria = new CriteriaCompo(new Criteria('id', $menuId)); + $menuArray = $menusHandler->getAll($menuCriteria, null, false, false); - /*assign ul class*/ - $menucss=''; - $menus_handler = xoops_getModuleHandler('menus', 'mymenus'); - $menucriteria = new CriteriaCompo(new Criteria('id', $menu_id)); - $menuObj = $menus_handler->getAll($menucriteria, null, false, false); - $itemsCount = count($menuObj); - if ($menuObj) { - for ($i = 0; $i < $itemsCount; ++$i) { - $menucss = isset($menuObj[$i]['css']) ? $menuObj[$i]['css']: ''; + if (is_array($menuArray) && (count($menuArray) > 0)) { + foreach ($menuArray as $menu) { + $menuCss = isset($menu['css']) ? "{$menu['css']} " : ''; } + $menuCss = trim($menuCss); } - if (!$menucss) { - $menucss = ""; + if (empty($menuCss)) { + $menuCss = ""; + } else { + $menuCss = implode(' ', $menuCss); } - $blockTpl->assign('menucss', $menucss); + $blockTpl->assign('menucss', $menuCss); - $block['content'] = $blockTpl->fetch($skin_info['template']); + $block['content'] = $blockTpl->fetch($skinInfo['template']); if ('template' == $options[3]) { $GLOBALS['xoopsTpl']->assign($options[4] , $block['content']); @@ -164,7 +163,7 @@ $registry->unsetAll(); unset($registry, $plugin); - $xoopsLogger->stopTime('My Menus Block'); + $xoopsLogger->stopTime('MyMenus Block'); return $block; } @@ -181,13 +180,13 @@ $options[3] = time(); } $i = 0; - $menus_handler =& xoops_getModuleHandler('menus', 'mymenus'); + $menusHandler =& xoops_getModuleHandler('menus', 'mymenus'); xoops_loadLanguage('admin', 'mymenus'); $criteria = new CriteriaCompo(); $criteria->setSort('title'); $criteria->setOrder('ASC'); - $menus = $menus_handler->getList($criteria); + $menus = $menusHandler->getList($criteria); unset($criteria); if (0 == count($menus)) { Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/docs/changelog.txt =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/docs/changelog.txt 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/docs/changelog.txt 2015-02-20 04:45:42 UTC (rev 13003) @@ -1,4 +1,13 @@ -<b><u>Version 1.51 Beta 1 (2015-01-20)</u></b> +<u>Version 1.51 Beta 2 (2015-02-19)</u> +- change to use XOOPS jquery js from Frameworks +- cleaned up skins directories to use common structure (/css, /images) +- fixed bug in rendering menucss in block +- added tw_red skin, inadvertently removed in previous release +- added mid KEY for SQL to improve performance for common queries +- normalized icons16 & icons32 definitions similar to other XOOPS modules +- more code cleanup + +<u>Version 1.51 Beta 1 (2015-01-20)</u> - fixed bug where editing menu item put item in 1st menu - fixed reference to JS files since moved to /assets - fixed/improve menu HTML rendering so it can validate @@ -11,65 +20,63 @@ - updated superfish to v1.7.5 - general code cleanup -<b><u>Version 1.5 Beta 4 (2014-04-23)</u></b> +<u>Version 1.5 Beta 4 (2014-04-23)</u> - moved all images, CSS, and JS files to /assets (mamba) - renamed .html Smarty templates to .tpl (mamba) -<b><u>Version 1.5 Beta 3 (2014-03-21)</u></b> +<u>Version 1.5 Beta 3 (2014-03-21)</u> - fixed bug: when editing a menu it looses the parent id (trabis) - changes: Prefix is not used anymore when assigning menus to smarty, choose full name now (trabis) - added: bootstrap skin with multi level menu support, requires a bootstrap theme prepared to hold the menu (trabis) - added: checks for multilingual menus to show only when the language is present (fla-ts/mamba) - fixed: bug with adding XOOPS_URL to images (mamba) -<b><u>Version 1.5 Beta 2 (2014-02-10)</u></b> +<u>Version 1.5 Beta 2 (2014-02-10)</u> - fixed some minor issues with block options (mamba) -<b><u>Version 1.5 Beta 1 (2014-02-08)</u></b> +<u>Version 1.5 Beta 1 (2014-02-08)</u> - merged @luciorota code: possibility to have more then one skin provided in the theme (bleekk) -<b><u>Version 1.454 Beta 1 (2014-01-29)</u></b> +<u>Version 1.454 Beta 1 (2014-01-29)</u> - Code cleanup (mamba) - bug fix: delete submenus when parent menuitem is deleted (bleekk) -<b><u>Version 1.45 Beta 1 (2014-01-29)</u></b> +<u>Version 1.45 Beta 1 (2014-01-29)</u> - german language (muki) - add feedback loading icon (bleekk) - add css classes for menus, important for <ul> style (bleekk) -<b><u>Version 1.44 Beta 1 (2014-01-28)</u></b> +<u>Version 1.44 Beta 1 (2014-01-28)</u> - added update module (bleekk) - fixed module admin templates (bleekk) - -<b><u>Version 1.43 Beta 1 (2014-01-25)</u></b> +<u>Version 1.43 Beta 1 (2014-01-25)</u> - added Drag & Drop with submenu option for menu links (bleekk) - added edit option for links in dialog window (bleekk) - added clean skin (bleekk) - changed css style to css class for links (bleekk) -<b><u>Version 1.42 Beta 1 (2012-12-17)</u></b> +<u>Version 1.42 Beta 1 (2012-12-17)</u> - added Drag & Drop for menu links (mamba) - renamed "menu" with "links" (mamba) - -<b><u>Version 1.41 (2012-12-17)</u></b> +<u>Version 1.41 (2012-12-17)</u> - small adjustments (mamba) -<b><u>Version 1.4 (2011-12-05)</u></b> +<u>Version 1.4 (2011-12-05)</u> - converted to XOOPS 2.5.x GUI (mamba) -<b><u>Version 1.3 (2011-04-02)</u></b> +<u>Version 1.3 (2011-04-02)</u> - bug fix : Dynamic.php plugin not loading module modinfo language. -<b><u>Version 1.2 (2010-09-20)</u></b> +<u>Version 1.2 (2010-09-20)</u> - bug fix : When visiting site.com when XOOPS_URL is set to www.site.com we get a blank page! -<b><u>Version 1.1 (2010-08-19)</u></b> +<u>Version 1.1 (2010-08-19)</u> - added plugin for displaying smarty variables. - added plugin for displaying constants. - image link must be a valid url, relative to root is deprecated. -<b><u>Version 1.0 (2010-08-11)</u></b> +<u>Version 1.0 (2010-08-11)</u> - First public release of the module. Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/bootstrap/skin_version.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/bootstrap/skin_version.php 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/bootstrap/skin_version.php 2015-02-20 04:45:42 UTC (rev 13003) @@ -26,7 +26,8 @@ ); $skinversion['js'] = array( - '../../assets/js/jquery-1.11.2.min.js', +// '../../assets/js/jquery-1.11.2.min.js', + '../../../../browse.php?Frameworks/jquery/jquery.js', '../../assets/js/hoverIntent.js', '../../assets/js/superfish.js' ); Added: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/css/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/css/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/css/index.html 2015-02-20 04:45:42 UTC (rev 13003) @@ -0,0 +1 @@ +<script>history.go(-1);</script> Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/css/style.css (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/style.css) =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/css/style.css (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/css/style.css 2015-02-20 04:45:42 UTC (rev 13003) @@ -0,0 +1,35 @@ +.mymenus-breadcrumb { + font: 11px Arial, Helvetica, sans-serif; + background-repeat: repeat-x; + height: 30px; + line-height: 30px; + color: #9b9b9b; + border: solid 1px #cacaca; + width: 100%; + overflow: hidden; + margin: 0; + padding: 0; +} +.mymenus-breadcrumb li { + list-style-type: none; + float: left; + padding-left: 10px; +} + +.mymenus-breadcrumb a { + height: 30px; + display: block; + background: no-repeat right; + padding-right: 15px; + text-decoration: none; + color: #454545; +} + +.mymenus-breadcrumb a:hover { + color: #35acc5; +} + +.mymenus-breadcrumb-home { + border: none; + margin: 8px 0; +} Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/skin_version.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/skin_version.php 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/skin_version.php 2015-02-20 04:45:42 UTC (rev 13003) @@ -20,7 +20,7 @@ $skinversion['template'] = 'templates/template.tpl'; -$skinversion['css'] = 'style.css'; +$skinversion['css'] = 'css/style.css'; /* $skinversion['js'] = array(); Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/style.css =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/style.css 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/breadcrumb/style.css 2015-02-20 04:45:42 UTC (rev 13003) @@ -1,35 +0,0 @@ -.mymenus-breadcrumb { - font: 11px Arial, Helvetica, sans-serif; - background-repeat: repeat-x; - height: 30px; - line-height: 30px; - color: #9b9b9b; - border: solid 1px #cacaca; - width: 100%; - overflow: hidden; - margin: 0; - padding: 0; -} -.mymenus-breadcrumb li { - list-style-type: none; - float: left; - padding-left: 10px; -} - -.mymenus-breadcrumb a { - height: 30px; - display: block; - background: no-repeat right; - padding-right: 15px; - text-decoration: none; - color: #454545; -} - -.mymenus-breadcrumb a:hover { - color: #35acc5; -} - -.mymenus-breadcrumb-home { - border: none; - margin: 8px 0; -} Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/clean/templates/template.tpl =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/clean/templates/template.tpl 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/clean/templates/template.tpl 2015-02-20 04:45:42 UTC (rev 13003) @@ -1,10 +1,6 @@ <{foreach item=menu from=$block}> <{ if $menu.oul && $menu.level == 0}> -<{ if $menucss != ''}> -<ul class="<{$menucss}>"> -<{ else}> -<ul> -<{ /if}> +<ul<{if $menucss != ''}> class="<{$menucss}>"<{/if}>> <{ /if}> <{assign var=myStr value="["|cat:$xoops_langcode|cat:"]"}> Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow_down_purple.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow_down_white.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow_over.gif =================================================================== (Binary files differ) Added: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/css/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/css/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/css/index.html 2015-02-20 04:45:42 UTC (rev 13003) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/css/pro_dropdown_3.css (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/pro_dropdown_3.css) =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/css/pro_dropdown_3.css (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/css/pro_dropdown_3.css 2015-02-20 04:45:42 UTC (rev 13003) @@ -0,0 +1,228 @@ +/* ================================================================ +This copyright notice must be kept untouched in the stylesheet at +all times. + +The original version of this stylesheet and the associated (x)html +is available at http://www.stunicholls.com/menu/pro_dropdown_3.html +Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. +This stylesheet and the associated (x)html may be modified in any +way to fit your requirements. +=================================================================== */ +.default_preload1 { /*background: url(three_0a.gif);*/ + +} + +.default_preload2 { /*background: url(three_1a.gif);*/ + +} + +#default_nav { + padding: 0; + margin: 0; + height: 30px; + min-height: 30px; + background: #846add url(../images/navbar-bg.png) repeat-x left bottom; + /*#846add*/ + color: #fff; + font-size: 1.1em; + text-align: center; + list-style-type: none; + position: relative; + z-index: 500; +} + +#default_nav li.default_top { + display: block; + float: left; +} + +#default_nav li a.default_top_link { + display: block; + float: left; + height: 23px; + line-height: 20px; + color: #fff; + text-decoration: none; + font-size: 11px; + font-weight: bold; + padding: 0 0 0 12px; + cursor: pointer; + /*background-color:#ddd;*/ /*background: url(three_0.gif);*/ +} + +#default_nav li a.default_top_link span { + float: left; + display: block; + padding: 0 24px 0 12px; + height: 23px; + /*background: url(three_0.gif) right top no-repeat;*/ +} + +#default_nav li a.default_top_link span.default_down { + float: left; + display: block; + padding: 0 24px 0 12px; + height: 23px; + background: url(../images/arrow_down_white.gif) 90% 50% no-repeat; +} + +#default_nav li:hover a.default_top_link,#default_nav li a.default_selected + { + color: #846add; + background-color: #ddd; + border-bottom: 3px solid #846add; +} + +#default_nav li:hover a.default_top_link span,#default_nav li a.default_selected span + { + background-color: #ddd; +} + +#default_nav li:hover a.default_top_link span.default_down,#default_nav li a.default_selected span.default_down + { + background: #ddd url(../images/arrow_down_purple.gif) no-repeat 90% 50%; +} + +/* Default list styling */ +#default_nav li:hover { + position: relative; + z-index: 200; +} + +#default_nav li:hover ul.default_sub { + left: 1px; + top: 26px; + background-color: #846add; + color: #fff; + white-space: nowrap; + width: auto; + height: auto; + z-index: 300; +} + +#default_nav li:hover ul.default_sub li { + display: block; + height: 23px; + position: relative; + float: left; + width: 90px; + text-align: left; + font-size: 11px; + font-weight: bold; +} + +#default_nav li:hover ul.default_sub li a { + display: block; + font-size: 11px; + height: 23px; + width: 90px; + background-color: #846add; + color: #fff; + line-height: 20px; + padding: 0 5px; + text-decoration: none; +} + +#default_nav li ul.default_sub li a.default_fly { + background: #e9e9e9 url(../images/arrow.gif) 80px 6px no-repeat; +} + +#default_nav li:hover ul.default_sub li a:hover { + background-color: #ddd; + color: #846add; +} + +#default_nav li:hover ul.default_sub li a.default_fly:hover { + background: #c6c7c9 url(../images/arrow_over.gif) 80px 6px no-repeat; + color: #fff; +} + +/*couleur des titres dans les menus d\xE9roul\xE9s*/ +#default_nav li b { + display: block; + font-size: 11px; + height: 18px; + width: 88px; + line-height: 18px; + margin-bottom: 3px; + text-indent: 6px; + color: #000; + border-bottom: 1px solid #000; + cursor: default; +} + +#default_nav li:hover li:hover ul,#default_nav li:hover li:hover li:hover ul,#default_nav li:hover li:hover li:hover li:hover ul,#default_nav li:hover li:hover li:hover li:hover li:hover ul + { + left: 90px; + top: -4px; + background: #e9e9e9; + padding: 3px; + border: 1px solid #0b4d97; + white-space: nowrap; + width: 90px; + z-index: 400; + height: auto; +} + +#default_nav ul,#default_nav li:hover ul ul,#default_nav li:hover li:hover ul ul,#default_nav li:hover li:hover li:hover ul ul,#default_nav li:hover li:hover li:hover li:hover ul ul + { + position: absolute; + left: -9999px; + top: -9999px; + width: 0; + height: 0; + margin: 0; + padding: 0; + list-style: none; +} + +#default_nav li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover li:hover li:hover a.default_fly + { + background: #c6c7c9 url(../images/arrow_over.gif) 80px 6px no-repeat; + color: #fff; + border-color: #fff; +} + +#default_nav li:hover li:hover li a.default_fly,#default_nav li:hover li:hover li:hover li a.default_fly,#default_nav li:hover li:hover li:hover li:hover li a.default_fly + { + background: #e9e9e9 url(../images/arrow.gif) 80px 6px no-repeat; + color: #000; + border-color: #e9e9e9; +} +/* +#xo-globalnav { + min-height: 28px; + margin: 0; + background: #846add url(../images/navbar-bg.png) repeat-x left bottom; + padding: 2px 0 0; + color: #fff; + font-size: 1.1em; + text-align: center; + list-style-type: none; +} +* html #xo-globalnav { + height: 28px; +} + +#xo-globalnav .x2-label { + display: none; +} + +#xo-globalnav li { + display: inline; + margin: 0; + padding-left: .5em; + padding-right: .5em; +} + +#xo-globalnav a { + background-color: inherit; + color: #fff; + text-decoration: none; +} + +#xo-globalnav a:hover { + background-color: inherit; + color: #b3aaec; + text-decoration: none; +}*/ Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/arrow.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow.gif) =================================================================== (Binary files differ) Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/arrow_down_purple.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow_down_purple.gif) =================================================================== (Binary files differ) Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/arrow_down_white.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow_down_white.gif) =================================================================== (Binary files differ) Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/arrow_over.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/arrow_over.gif) =================================================================== (Binary files differ) Added: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/index.html 2015-02-20 04:45:42 UTC (rev 13003) @@ -0,0 +1 @@ +<script>history.go(-1);</script> Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/images/navbar-bg.png (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/navbar-bg.png) =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/navbar-bg.png =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/pro_dropdown_3.css =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/pro_dropdown_3.css 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/pro_dropdown_3.css 2015-02-20 04:45:42 UTC (rev 13003) @@ -1,228 +0,0 @@ -/* ================================================================ -This copyright notice must be kept untouched in the stylesheet at -all times. - -The original version of this stylesheet and the associated (x)html -is available at http://www.stunicholls.com/menu/pro_dropdown_3.html -Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. -This stylesheet and the associated (x)html may be modified in any -way to fit your requirements. -=================================================================== */ -.default_preload1 { /*background: url(three_0a.gif);*/ - -} - -.default_preload2 { /*background: url(three_1a.gif);*/ - -} - -#default_nav { - padding: 0; - margin: 0; - height: 30px; - min-height: 30px; - background: #846add url(navbar-bg.png) repeat-x left bottom; - /*#846add*/ - color: #fff; - font-size: 1.1em; - text-align: center; - list-style-type: none; - position: relative; - z-index: 500; -} - -#default_nav li.default_top { - display: block; - float: left; -} - -#default_nav li a.default_top_link { - display: block; - float: left; - height: 23px; - line-height: 20px; - color: #fff; - text-decoration: none; - font-size: 11px; - font-weight: bold; - padding: 0 0 0 12px; - cursor: pointer; - /*background-color:#ddd;*/ /*background: url(three_0.gif);*/ -} - -#default_nav li a.default_top_link span { - float: left; - display: block; - padding: 0 24px 0 12px; - height: 23px; - /*background: url(three_0.gif) right top no-repeat;*/ -} - -#default_nav li a.default_top_link span.default_down { - float: left; - display: block; - padding: 0 24px 0 12px; - height: 23px; - background: url(arrow_down_white.gif) 90% 50% no-repeat; -} - -#default_nav li:hover a.default_top_link,#default_nav li a.default_selected - { - color: #846add; - background-color: #ddd; - border-bottom: 3px solid #846add; -} - -#default_nav li:hover a.default_top_link span,#default_nav li a.default_selected span - { - background-color: #ddd; -} - -#default_nav li:hover a.default_top_link span.default_down,#default_nav li a.default_selected span.default_down - { - background: #ddd url(arrow_down_purple.gif) no-repeat 90% 50%; -} - -/* Default list styling */ -#default_nav li:hover { - position: relative; - z-index: 200; -} - -#default_nav li:hover ul.default_sub { - left: 1px; - top: 26px; - background-color: #846add; - color: #fff; - white-space: nowrap; - width: auto; - height: auto; - z-index: 300; -} - -#default_nav li:hover ul.default_sub li { - display: block; - height: 23px; - position: relative; - float: left; - width: 90px; - text-align: left; - font-size: 11px; - font-weight: bold; -} - -#default_nav li:hover ul.default_sub li a { - display: block; - font-size: 11px; - height: 23px; - width: 90px; - background-color: #846add; - color: #fff; - line-height: 20px; - padding: 0 5px; - text-decoration: none; -} - -#default_nav li ul.default_sub li a.default_fly { - background: #e9e9e9 url(arrow.gif) 80px 6px no-repeat; -} - -#default_nav li:hover ul.default_sub li a:hover { - background-color: #ddd; - color: #846add; -} - -#default_nav li:hover ul.default_sub li a.default_fly:hover { - background: #c6c7c9 url(arrow_over.gif) 80px 6px no-repeat; - color: #fff; -} - -/*couleur des titres dans les menus d\xE9roul\xE9s*/ -#default_nav li b { - display: block; - font-size: 11px; - height: 18px; - width: 88px; - line-height: 18px; - margin-bottom: 3px; - text-indent: 6px; - color: #000; - border-bottom: 1px solid #000; - cursor: default; -} - -#default_nav li:hover li:hover ul,#default_nav li:hover li:hover li:hover ul,#default_nav li:hover li:hover li:hover li:hover ul,#default_nav li:hover li:hover li:hover li:hover li:hover ul - { - left: 90px; - top: -4px; - background: #e9e9e9; - padding: 3px; - border: 1px solid #0b4d97; - white-space: nowrap; - width: 90px; - z-index: 400; - height: auto; -} - -#default_nav ul,#default_nav li:hover ul ul,#default_nav li:hover li:hover ul ul,#default_nav li:hover li:hover li:hover ul ul,#default_nav li:hover li:hover li:hover li:hover ul ul - { - position: absolute; - left: -9999px; - top: -9999px; - width: 0; - height: 0; - margin: 0; - padding: 0; - list-style: none; -} - -#default_nav li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover li:hover a.default_fly,#default_nav li:hover li:hover li:hover li:hover li:hover a.default_fly - { - background: #c6c7c9 url(arrow_over.gif) 80px 6px no-repeat; - color: #fff; - border-color: #fff; -} - -#default_nav li:hover li:hover li a.default_fly,#default_nav li:hover li:hover li:hover li a.default_fly,#default_nav li:hover li:hover li:hover li:hover li a.default_fly - { - background: #e9e9e9 url(arrow.gif) 80px 6px no-repeat; - color: #000; - border-color: #e9e9e9; -} -/* -#xo-globalnav { - min-height: 28px; - margin: 0; - background: #846add url(../img/navbar-bg.png) repeat-x left bottom; - padding: 2px 0 0; - color: #fff; - font-size: 1.1em; - text-align: center; - list-style-type: none; -} -* html #xo-globalnav { - height: 28px; -} - -#xo-globalnav .x2-label { - display: none; -} - -#xo-globalnav li { - display: inline; - margin: 0; - padding-left: .5em; - padding-right: .5em; -} - -#xo-globalnav a { - background-color: inherit; - color: #fff; - text-decoration: none; -} - -#xo-globalnav a:hover { - background-color: inherit; - color: #b3aaec; - text-decoration: none; -}*/ Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/skin_version.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/skin_version.php 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/default/skin_version.php 2015-02-20 04:45:42 UTC (rev 13003) @@ -19,6 +19,6 @@ */ $skinversion['template'] = 'templates/template.tpl'; -$skinversion['css'] = array('pro_dropdown_3.css'); +$skinversion['css'] = array('css/pro_dropdown_3.css'); $skinversion['js'] = array('stuHover.js'); $skinversion['prefix'] = 'sf'; Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/mainmenu/templates/template.tpl =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/mainmenu/templates/template.tpl 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/mainmenu/templates/template.tpl 2015-02-20 04:45:42 UTC (rev 13003) @@ -1,3 +1,4 @@ + <div id="mainmenu"> <{foreach item=menu from=$block}> <{ if $menu.level == 0}> Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/arrow.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/arrow_over.gif =================================================================== (Binary files differ) Added: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/css/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/css/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/css/index.html 2015-02-20 04:45:42 UTC (rev 13003) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/css/pro_dropdown_3.css (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/pro_dropdown_3.css) =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/css/pro_dropdown_3.css (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/css/pro_dropdown_3.css 2015-02-20 04:45:42 UTC (rev 13003) @@ -0,0 +1,184 @@ +/* ================================================================ +This copyright notice must be kept untouched in the stylesheet at +all times. + +The original version of this stylesheet and the associated (x)html +is available at http://www.stunicholls.com/menu/pro_dropdown_3.html +Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. +This stylesheet and the associated (x)html may be modified in any +way to fit your requirements. +=================================================================== */ +.preload1 { + background: url(../images/three_0a.gif); +} + +.preload2 { + background: url(../images/three_1a.gif); +} + +#nav { + padding: 0; + margin: 0; + list-style: none; + height: 38px; + background: #fff url(../images/three_0.gif) repeat-x; + position: relative; + z-index: 500; + font-family: arial, verdana, sans-serif; +} + +#nav li.top { + display: block; + float: left; +} + +#nav li a.top_link { + display: block; + float: left; + height: 35px; + line-height: 33px; + color: #ccc; + text-decoration: none; + font-size: 11px; + font-weight: bold; + padding: 0 0 0 12px; + cursor: pointer; + background: url(../images/three_0.gif); +} + +#nav li a.top_link span { + float: left; + display: block; + padding: 0 24px 0 12px; + height: 35px; + background: url(../images/three_0.gif) right top no-repeat; +} + +#nav li a.top_link span.down { + float: left; + display: block; + padding: 0 24px 0 12px; + height: 35px; + background: url(../images/three_0a.gif) no-repeat right top; +} + +#nav li:hover a.top_link,#nav li a.selected { + color: #fff; + background: url(../images/three_1.gif) no-repeat; +} + +#nav li:hover a.top_link span,#nav li a.selected span { + background: url(../images/three_1.gif) no-repeat right top; +} + +#nav li:hover a.top_link span.down,#nav li a.selected span.down { + background: url(../images/three_1a.gif) no-repeat right top; + padding-bottom: 3px; +} + +/* Default list styling */ +#nav li:hover { + position: relative; + z-index: 200; +} + +#nav li:hover ul.sub { + left: 1px; + top: 38px; + background: #e9e9e9; + padding: 3px; + border: 1px solid #0b4d97; + white-space: nowrap; + width: 90px; + height: auto; + z-index: 300; +} + +#nav li:hover ul.sub li { + display: block; + height: 20px; + position: relative; + float: left; + width: 90px; + font-weight: normal; +} + +#nav li:hover ul.sub li a { + display: block; + font-size: 11px; + height: 18px; + width: 88px; + line-height: 18px; + text-indent: 5px; + color: #000; + text-decoration: none; + border: 1px solid #e9e9e9; +} + +#nav li ul.sub li a.fly { + background: #e9e9e9 url(../images/arrow.gif) 80px 6px no-repeat; +} + +#nav li:hover ul.sub li a:hover { + background: #c6c7c9; + color: #fff; + border-color: #fff; +} + +#nav li:hover ul.sub li a.fly:hover { + background: #c6c7c9 url(../images/arrow_over.gif) 80px 6px no-repeat; + color: #fff; +} + +/*couleur des titres dans les menus d\xE9roul\xE9s*/ +#nav li b { + display: block; + font-size: 11px; + height: 18px; + width: 88px; + line-height: 18px; + margin-bottom: 3px; + text-indent: 6px; + color: #000; + border-bottom: 1px solid #000; + cursor: default; +} + +#nav li:hover li:hover ul,#nav li:hover li:hover li:hover ul,#nav li:hover li:hover li:hover li:hover ul,#nav li:hover li:hover li:hover li:hover li:hover ul + { + left: 90px; + top: -4px; + background: #e9e9e9; + padding: 3px; + border: 1px solid #0b4d97; + white-space: nowrap; + width: 90px; + z-index: 400; + height: auto; +} + +#nav ul,#nav li:hover ul ul,#nav li:hover li:hover ul ul,#nav li:hover li:hover li:hover ul ul,#nav li:hover li:hover li:hover li:hover ul ul + { + position: absolute; + left: -9999px; + top: -9999px; + width: 0; + height: 0; + margin: 0; + padding: 0; + list-style: none; +} + +#nav li:hover li:hover a.fly,#nav li:hover li:hover li:hover a.fly,#nav li:hover li:hover li:hover li:hover a.fly,#nav li:hover li:hover li:hover li:hover li:hover a.fly + { + background: #c6c7c9 url(../images/arrow_over.gif) 80px 6px no-repeat; + color: #fff; + border-color: #fff; +} + +#nav li:hover li:hover li a.fly,#nav li:hover li:hover li:hover li a.fly,#nav li:hover li:hover li:hover li:hover li a.fly + { + background: #e9e9e9 url(../images/arrow.gif) 80px 6px no-repeat; + color: #000; + border-color: #e9e9e9; +} Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/arrow.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/arrow.gif) =================================================================== (Binary files differ) Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/arrow_over.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/arrow_over.gif) =================================================================== (Binary files differ) Added: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/index.html =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/index.html (rev 0) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/index.html 2015-02-20 04:45:42 UTC (rev 13003) @@ -0,0 +1 @@ +<script>history.go(-1);</script> \ No newline at end of file Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/three_0.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_0.gif) =================================================================== (Binary files differ) Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/three_0a.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_0a.gif) =================================================================== (Binary files differ) Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/three_1.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_1.gif) =================================================================== (Binary files differ) Copied: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/images/three_1a.gif (from rev 12942, XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_1a.gif) =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/pro_dropdown_3.css =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/pro_dropdown_3.css 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/pro_dropdown_3.css 2015-02-20 04:45:42 UTC (rev 13003) @@ -1,184 +0,0 @@ -/* ================================================================ -This copyright notice must be kept untouched in the stylesheet at -all times. - -The original version of this stylesheet and the associated (x)html -is available at http://www.stunicholls.com/menu/pro_dropdown_3.html -Copyright (c) 2005-2007 Stu Nicholls. All rights reserved. -This stylesheet and the associated (x)html may be modified in any -way to fit your requirements. -=================================================================== */ -.preload1 { - background: url(three_0a.gif); -} - -.preload2 { - background: url(three_1a.gif); -} - -#nav { - padding: 0; - margin: 0; - list-style: none; - height: 38px; - background: #fff url(three_0.gif) repeat-x; - position: relative; - z-index: 500; - font-family: arial, verdana, sans-serif; -} - -#nav li.top { - display: block; - float: left; -} - -#nav li a.top_link { - display: block; - float: left; - height: 35px; - line-height: 33px; - color: #ccc; - text-decoration: none; - font-size: 11px; - font-weight: bold; - padding: 0 0 0 12px; - cursor: pointer; - background: url(three_0.gif); -} - -#nav li a.top_link span { - float: left; - display: block; - padding: 0 24px 0 12px; - height: 35px; - background: url(three_0.gif) right top no-repeat; -} - -#nav li a.top_link span.down { - float: left; - display: block; - padding: 0 24px 0 12px; - height: 35px; - background: url(three_0a.gif) no-repeat right top; -} - -#nav li:hover a.top_link,#nav li a.selected { - color: #fff; - background: url(three_1.gif) no-repeat; -} - -#nav li:hover a.top_link span,#nav li a.selected span { - background: url(three_1.gif) no-repeat right top; -} - -#nav li:hover a.top_link span.down,#nav li a.selected span.down { - background: url(three_1a.gif) no-repeat right top; - padding-bottom: 3px; -} - -/* Default list styling */ -#nav li:hover { - position: relative; - z-index: 200; -} - -#nav li:hover ul.sub { - left: 1px; - top: 38px; - background: #e9e9e9; - padding: 3px; - border: 1px solid #0b4d97; - white-space: nowrap; - width: 90px; - height: auto; - z-index: 300; -} - -#nav li:hover ul.sub li { - display: block; - height: 20px; - position: relative; - float: left; - width: 90px; - font-weight: normal; -} - -#nav li:hover ul.sub li a { - display: block; - font-size: 11px; - height: 18px; - width: 88px; - line-height: 18px; - text-indent: 5px; - color: #000; - text-decoration: none; - border: 1px solid #e9e9e9; -} - -#nav li ul.sub li a.fly { - background: #e9e9e9 url(arrow.gif) 80px 6px no-repeat; -} - -#nav li:hover ul.sub li a:hover { - background: #c6c7c9; - color: #fff; - border-color: #fff; -} - -#nav li:hover ul.sub li a.fly:hover { - background: #c6c7c9 url(arrow_over.gif) 80px 6px no-repeat; - color: #fff; -} - -/*couleur des titres dans les menus d\xE9roul\xE9s*/ -#nav li b { - display: block; - font-size: 11px; - height: 18px; - width: 88px; - line-height: 18px; - margin-bottom: 3px; - text-indent: 6px; - color: #000; - border-bottom: 1px solid #000; - cursor: default; -} - -#nav li:hover li:hover ul,#nav li:hover li:hover li:hover ul,#nav li:hover li:hover li:hover li:hover ul,#nav li:hover li:hover li:hover li:hover li:hover ul - { - left: 90px; - top: -4px; - background: #e9e9e9; - padding: 3px; - border: 1px solid #0b4d97; - white-space: nowrap; - width: 90px; - z-index: 400; - height: auto; -} - -#nav ul,#nav li:hover ul ul,#nav li:hover li:hover ul ul,#nav li:hover li:hover li:hover ul ul,#nav li:hover li:hover li:hover li:hover ul ul - { - position: absolute; - left: -9999px; - top: -9999px; - width: 0; - height: 0; - margin: 0; - padding: 0; - list-style: none; -} - -#nav li:hover li:hover a.fly,#nav li:hover li:hover li:hover a.fly,#nav li:hover li:hover li:hover li:hover a.fly,#nav li:hover li:hover li:hover li:hover li:hover a.fly - { - background: #c6c7c9 url(arrow_over.gif) 80px 6px no-repeat; - color: #fff; - border-color: #fff; -} - -#nav li:hover li:hover li a.fly,#nav li:hover li:hover li:hover li a.fly,#nav li:hover li:hover li:hover li:hover li a.fly - { - background: #e9e9e9 url(arrow.gif) 80px 6px no-repeat; - color: #000; - border-color: #e9e9e9; -} \ No newline at end of file Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/skin_version.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/skin_version.php 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/skin_version.php 2015-02-20 04:45:42 UTC (rev 13003) @@ -19,6 +19,6 @@ */ $skinversion['template'] = 'templates/template.tpl'; -$skinversion['css'] = array('pro_dropdown_3.css'); +$skinversion['css'] = array('css/pro_dropdown_3.css'); $skinversion['js'] = array('stuHover.js'); $skinversion['prefix'] = 'sf'; Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_0.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_0a.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_1.gif =================================================================== (Binary files differ) Deleted: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/multiblack/three_1a.gif =================================================================== (Binary files differ) Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/superfish/skin_version.php =================================================================== --- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/superfish/skin_version.php 2015-02-19 09:37:52 UTC (rev 13002) +++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/mymenus/skins/superfish/skin_version.php 2015-02-20 04:45:42 UTC (rev 13003) @@ -22,7 +22,8 @@ $skinvers... [truncated message content] |