Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[13018] XoopsCore/branches/2.5.x/2.5.8_timgno/htdocs
|
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] |
