|
From: <be...@us...> - 2014-03-19 09:18:37
|
Revision: 12394
http://sourceforge.net/p/xoops/svn/12394
Author: beckmi
Date: 2014-03-19 09:18:33 +0000 (Wed, 19 Mar 2014)
Log Message:
-----------
Adding 1.01 Beta 1 (see changelog.txt)
Modified Paths:
--------------
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/changelog.txt
XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/lang_diff.txt
XoopsModules/moduleinstaller/trunk/moduleinstaller/js/xo-installer.js
XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/admin.php
XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php 2014-03-19 09:11:53 UTC (rev 12393)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/install.php 2014-03-19 09:18:33 UTC (rev 12394)
@@ -16,6 +16,8 @@
**/
include 'admin_header.php';
xoops_cp_header();
+
+
$xoopsOption['checkadmin'] = true;
$xoopsOption['hascommon'] = true;
require_once './../include/common.inc.php';
@@ -91,6 +93,7 @@
$javascript = "";
$content = "<ul class='log'><li>";
$content .= "<table class='module'>\n";
+// $content .= "<input type='button' name='getTotal1' id='getTotal1' value='Select All' onclick='selectAll();' /> <input type='button' name='getTotal1' id='getTotal1' value='Unselect All' onclick='unselectAll();' /><br />";
foreach ($dirlist as $file) {
clearstatcache();
if (!in_array($file, $listed_mods)) {
@@ -121,7 +124,7 @@
$content .= " <td class='yesno'>";
$content .= $moduleYN->render() ;
$content .= " </td></tr>\n";
- $toinstal++;
+ ++$toinstal;
}
}
$content .= "</table>";
@@ -131,8 +134,24 @@
$content = "<div class='x2-note confirmMsg'>" . NO_MODULES_FOUND . "</div>";
}
}
+
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('install.php');
+$indexAdmin->addItemButton(
+ _AM_INSTALLER_SELECT_ALL,
+ "javascript:selectAll();",
+ 'button_ok'
+);
+
+$indexAdmin->addItemButton(
+ _AM_INSTALLER_SELECT_NONE,
+ "javascript:unselectAll();",
+ 'prune'
+);
+
+echo $indexAdmin->renderButton('left', '');
+
+
include './../include/install_tpl.php';
include 'admin_footer.php';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php 2014-03-19 09:11:53 UTC (rev 12393)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/admin/uninstall.php 2014-03-19 09:18:33 UTC (rev 12394)
@@ -123,7 +123,7 @@
$content .= " <td class='yesno'>";
$content .= $moduleYN->render() ;
$content .= " </td></tr>\n";
- $toinstal++;
+ ++$toinstal;
}
}
$content .= "</table>";
@@ -136,5 +136,21 @@
$indexAdmin = new ModuleAdmin();
echo $indexAdmin->addNavigation('uninstall.php');
+
+$indexAdmin->addItemButton(
+ _AM_INSTALLER_SELECT_ALL,
+ "javascript:selectAll();",
+ 'button_ok'
+);
+
+$indexAdmin->addItemButton(
+ _AM_INSTALLER_SELECT_NONE,
+ "javascript:unselectAll();",
+ 'prune'
+);
+
+echo $indexAdmin->renderButton('left', '');
+
+
include './../include/install_tpl.php';
include 'admin_footer.php';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php 2014-03-19 09:11:53 UTC (rev 12393)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/class/installwizard.php 2014-03-19 09:18:33 UTC (rev 12394)
@@ -32,6 +32,9 @@
var $pageIndex = 0;
var $configs = array();
+ /**
+ * @return bool
+ */
function xoInit()
{
if (@empty( $_SERVER['REQUEST_URI'])) {
@@ -90,6 +93,9 @@
return true;
}
+ /**
+ * @return bool
+ */
function checkAccess()
{
if (INSTALL_USER != '' && INSTALL_PASSWORD != '') {
@@ -131,6 +137,9 @@
return true;
}
+ /**
+ * @param $file
+ */
function loadLangFile($file)
{
if (file_exists("./language/{$this->language}/{$file}.php")) {
@@ -140,6 +149,9 @@
}
}
+ /**
+ * @param $language
+ */
function initLanguage($language)
{
$language = preg_replace("/[^a-z0-9_\-]/i", "", $language);
@@ -150,6 +162,11 @@
$this->loadLangFile('install');
}
+ /**
+ * @param $page
+ *
+ * @return bool|mixed
+ */
function setPage($page)
{
$pages = array_keys($this->pages);
@@ -170,6 +187,9 @@
return $this->pageIndex;
}
+ /**
+ * @return string
+ */
function baseLocation()
{
$proto = ( @$_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
@@ -179,6 +199,11 @@
return $proto . '://' . $host . $base;
}
+ /**
+ * @param $page
+ *
+ * @return string
+ */
function pageURI( $page )
{
$pages = array_keys($this->pages);
@@ -204,6 +229,11 @@
return $this->baseLocation() . "/page_{$page}.php";
}
+ /**
+ * @param $page
+ * @param int $status
+ * @param string $message
+ */
function redirectToPage( $page, $status = 303, $message = 'See other' )
{
$location = $this->pageURI( $page );
@@ -213,6 +243,9 @@
header("Location: {$location}");
}
+ /**
+ * @return string
+ */
function CreateForm()
{
$hidden = '';
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/changelog.txt
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/changelog.txt 2014-03-19 09:11:53 UTC (rev 12393)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/changelog.txt 2014-03-19 09:18:33 UTC (rev 12394)
@@ -1,3 +1,7 @@
+1.01 Beta 1 [2014/03/18]
+=================================
+- added option to select and un-select ALL modules (mamba)
+
1.00 Final [2014/02/15]
=================================
- fixed highlight of selected modules (mamba)
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/lang_diff.txt
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/lang_diff.txt 2014-03-19 09:11:53 UTC (rev 12393)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/docs/lang_diff.txt 2014-03-19 09:18:33 UTC (rev 12394)
@@ -1,4 +1,10 @@
LANGUAGE DIFFERENCES
=====================
-Below are language differences from a version to next version.
\ No newline at end of file
+Below are language differences from a version to next version.
+
+1.01
+-------------------
+/language/english/admin.php
+added define('_AM_INSTALLER_SELECT_ALL' , "Select All");
+added define('_AM_INSTALLER_SELECT_NONE' , "Un-Select All");
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/js/xo-installer.js
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/js/xo-installer.js 2014-03-19 09:11:53 UTC (rev 12393)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/js/xo-installer.js 2014-03-19 09:18:33 UTC (rev 12394)
@@ -113,4 +113,37 @@
return true;
}
-window.onload = xoopsExternalLinks;
\ No newline at end of file
+
+function selectAll() {
+// alert('You are clicking on me');
+ var radios = document.getElementsByTagName("input");
+ var modules = document.getElementsByTagName("input");
+ for (var i = 0; i < radios.length; i++) {
+
+ if (radios[i].type === "radio" && radios[i].id.slice(-1) === "1") {
+ radios[i].checked = true;
+
+ radios[i].parentNode.parentNode.style.background = '#E6EFC2';
+ } else {
+ radios[i].checked = false;
+ }
+ }
+}
+
+
+function unselectAll() {
+// alert('You are clicking on me');
+ var radios = document.getElementsByTagName("input");
+ for (var i = 0; i < radios.length; i++) {
+
+ if (radios[i].type === "radio" && radios[i].id.slice(-1) === "2") {
+ radios[i].checked = true;
+ radios[i].parentNode.parentNode.style.background = 'transparent';
+ } else {
+ radios[i].checked = false;
+ }
+ }
+}
+
+
+window.onload = xoopsExternalLinks;
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/admin.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/admin.php 2014-03-19 09:11:53 UTC (rev 12393)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/language/english/admin.php 2014-03-19 09:18:33 UTC (rev 12394)
@@ -2,3 +2,5 @@
// Text for Admin footer
define("_AM_ADMIN_FOOTER","<div class='center smallsmall italic pad5'>Module Installer is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
+define('_AM_INSTALLER_SELECT_ALL' , "Select All");
+define('_AM_INSTALLER_SELECT_NONE' , "Un-Select All");
Modified: XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php
===================================================================
--- XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php 2014-03-19 09:11:53 UTC (rev 12393)
+++ XoopsModules/moduleinstaller/trunk/moduleinstaller/xoops_version.php 2014-03-19 09:18:33 UTC (rev 12394)
@@ -27,7 +27,7 @@
$moduleDirName = basename( dirname( __FILE__ ) ) ;
$modversion['name'] = _MI_INSTALLER_NAME;
-$modversion['version'] = '1.0';
+$modversion['version'] = '1.01';
$modversion['description'] = _MI_INSTALLER_DESC;
$modversion['author'] = 'Michael Beck';
$modversion['nickname'] = 'Mamba';
@@ -45,7 +45,7 @@
$modversion['release_date'] = '2014/02/15';
$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
-$modversion["module_status"] = "Final";
+$modversion["module_status"] = "Beta 1";
$modversion['min_php']='5.3.7';
$modversion['min_xoops']="2.5.6";
$modversion['min_admin']='1.1';
|