|
From: <be...@us...> - 2012-06-26 17:34:09
|
Revision: 9727
http://xoops.svn.sourceforge.net/xoops/?rev=9727&view=rev
Author: beckmi
Date: 2012-06-26 17:34:02 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
adding default strings for localization (cesag)
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php
XoopsModules/xforms/branches/mamba/xforms/admin/main.php
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
XoopsModules/xforms/trunk/xforms/admin/default_elements.php
XoopsModules/xforms/trunk/xforms/admin/main.php
XoopsModules/xforms/trunk/xforms/docs/changelog.txt
XoopsModules/xforms/trunk/xforms/language/english/admin.php
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/default_elements.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -5,7 +5,7 @@
if( !defined('xforms_ROOT_PATH') ){ exit(); }
$defaults = array();
-$defaults[0]['caption'] = 'Your name';
+$defaults[0]['caption'] = _AM_ELE_YOUR_NAME;
$defaults[0]['req'] = true;
$defaults[0]['order'] = 1;
$defaults[0]['display'] = 1;
@@ -16,7 +16,7 @@
2 => '{UNAME}'
);
-$defaults[1]['caption'] = 'Email address';
+$defaults[1]['caption'] = _AM_ELE_YOUR_EMAIL;
$defaults[1]['req'] = true;
$defaults[1]['order'] = 2;
$defaults[1]['display'] = 1;
@@ -27,7 +27,7 @@
2 => '{EMAIL}'
);
-$defaults[2]['caption'] = 'Your comments';
+$defaults[2]['caption'] = _AM_ELE_YOUR_COMMENTS;
$defaults[2]['req'] = true;
$defaults[2]['order'] = 3;
$defaults[2]['display'] = 1;
Modified: XoopsModules/xforms/branches/mamba/xforms/admin/main.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/admin/main.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/admin/main.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -12,7 +12,13 @@
default:
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('main.php') ;
+ echo $indexAdmin->addNavigation('main.php') ;
+
+ $indexAdmin->addItemButton(_MI_xforms_ADMENU2, 'main.php?op=edit', 'add', '');
+ $indexAdmin->addItemButton(_MI_xforms_ADMENU3, 'editelement.php', 'add', '');
+ echo $indexAdmin->renderButton('right', '');
+
+
$criteria = new Criteria(1, 1);
$criteria->setSort('form_order');
$criteria->setOrder('ASC');
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 17:34:02 UTC (rev 9727)
@@ -2,6 +2,7 @@
=================================
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
+- adding default strings for localization (cesag)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/language/english/admin.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -110,4 +110,9 @@
define('_AM_XFORMS_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
// Text for Admin footer
-//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
+//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
+
+//xForms 1.21 Defaults
+define("_AM_ELE_YOUR_NAME",'Your Name');
+define("_AM_ELE_YOUR_EMAIL",'Email address');
+define("_AM_ELE_YOUR_COMMENTS",'Your comments');
Modified: XoopsModules/xforms/branches/mamba/xforms/xoops_version.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/branches/mamba/xforms/xoops_version.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -20,7 +20,7 @@
//about
$modversion['release_date'] = '2012/06/25';
-$modversion["module_website_url"] = "http://www.xoops.org/";
+$modversion["module_website_url"] = "www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["module_status"] = "Final";
$modversion['min_php']='5.2';
Modified: XoopsModules/xforms/trunk/xforms/admin/default_elements.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/default_elements.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/trunk/xforms/admin/default_elements.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -5,7 +5,7 @@
if( !defined('xforms_ROOT_PATH') ){ exit(); }
$defaults = array();
-$defaults[0]['caption'] = 'Your name';
+$defaults[0]['caption'] = _AM_ELE_YOUR_NAME;
$defaults[0]['req'] = true;
$defaults[0]['order'] = 1;
$defaults[0]['display'] = 1;
@@ -16,7 +16,7 @@
2 => '{UNAME}'
);
-$defaults[1]['caption'] = 'Email address';
+$defaults[1]['caption'] = _AM_ELE_YOUR_EMAIL;
$defaults[1]['req'] = true;
$defaults[1]['order'] = 2;
$defaults[1]['display'] = 1;
@@ -27,7 +27,7 @@
2 => '{EMAIL}'
);
-$defaults[2]['caption'] = 'Your comments';
+$defaults[2]['caption'] = _AM_ELE_YOUR_COMMENTS;
$defaults[2]['req'] = true;
$defaults[2]['order'] = 3;
$defaults[2]['display'] = 1;
Modified: XoopsModules/xforms/trunk/xforms/admin/main.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/admin/main.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/trunk/xforms/admin/main.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -12,7 +12,13 @@
default:
xoops_cp_header();
$indexAdmin = new ModuleAdmin();
- echo $indexAdmin->addNavigation('main.php') ;
+ echo $indexAdmin->addNavigation('main.php') ;
+
+ $indexAdmin->addItemButton(_MI_xforms_ADMENU2, 'main.php?op=edit', 'add', '');
+ $indexAdmin->addItemButton(_MI_xforms_ADMENU3, 'editelement.php', 'add', '');
+ echo $indexAdmin->renderButton('right', '');
+
+
$criteria = new Criteria(1, 1);
$criteria->setSort('form_order');
$criteria->setOrder('ASC');
Modified: XoopsModules/xforms/trunk/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 17:34:02 UTC (rev 9727)
@@ -2,6 +2,7 @@
=================================
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
+- adding default strings for localization (cesag)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/trunk/xforms/language/english/admin.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/language/english/admin.php 2012-06-26 14:18:44 UTC (rev 9726)
+++ XoopsModules/xforms/trunk/xforms/language/english/admin.php 2012-06-26 17:34:02 UTC (rev 9727)
@@ -110,4 +110,9 @@
define('_AM_XFORMS_MODULEADMIN_MISSING','Error: The ModuleAdmin class is missing. Please install the ModuleAdmin Class into /Frameworks (see /docs/readme.txt)');
// Text for Admin footer
-//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
+//define("_AM_XFORMS_FOOTER", "<div class='center smallsmall italic pad5'>xForms is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
+
+//xForms 1.21 Defaults
+define("_AM_ELE_YOUR_NAME",'Your Name');
+define("_AM_ELE_YOUR_EMAIL",'Email address');
+define("_AM_ELE_YOUR_COMMENTS",'Your comments');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-26 20:56:19
|
Revision: 9730
http://xoops.svn.sourceforge.net/xoops/?rev=9730&view=rev
Author: beckmi
Date: 2012-06-26 20:56:13 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
fixing bug in form_render.php with empty checkbox (cesag/mamba)
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/include/form_render.php
XoopsModules/xforms/trunk/xforms/docs/changelog.txt
XoopsModules/xforms/trunk/xforms/include/form_render.php
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 19:56:07 UTC (rev 9729)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 20:56:13 UTC (rev 9730)
@@ -1,8 +1,9 @@
-1.21 Mamba (2011-07-18)
+1.21 Mamba (2012-06-26)
=================================
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
-- adding default strings for localization (cesag)
+- adding default strings for localization (cesag/mamba)
+- fixing bug in form_render.php with empty checkbox (cesag/mamba)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/branches/mamba/xforms/include/form_render.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/include/form_render.php 2012-06-26 19:56:07 UTC (rev 9729)
+++ XoopsModules/xforms/branches/mamba/xforms/include/form_render.php 2012-06-26 20:56:13 UTC (rev 9730)
@@ -45,7 +45,7 @@
$id = str_replace('ele_', '', $e->getName());
}elseif( method_exists($e, 'getElements') ){
$obj = $e->getElements();
- $id = str_replace('ele_', '', $obj[0]->getName());
+ $id = str_replace('ele_', '', isset($obj[0]) ? $obj[0]->getName() : '');
$id = str_replace('[]', '', $id);
}
if( isset($elements[$id]) ){
Modified: XoopsModules/xforms/trunk/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 19:56:07 UTC (rev 9729)
+++ XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 20:56:13 UTC (rev 9730)
@@ -1,8 +1,9 @@
-1.21 Mamba (2011-07-18)
+1.21 Mamba (2012-06-26)
=================================
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
-- adding default strings for localization (cesag)
+- adding default strings for localization (cesag/mamba)
+- fixing bug in form_render.php with empty checkbox (cesag/mamba)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/trunk/xforms/include/form_render.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/include/form_render.php 2012-06-26 19:56:07 UTC (rev 9729)
+++ XoopsModules/xforms/trunk/xforms/include/form_render.php 2012-06-26 20:56:13 UTC (rev 9730)
@@ -45,7 +45,7 @@
$id = str_replace('ele_', '', $e->getName());
}elseif( method_exists($e, 'getElements') ){
$obj = $e->getElements();
- $id = str_replace('ele_', '', $obj[0]->getName());
+ $id = str_replace('ele_', '', isset($obj[0]) ? $obj[0]->getName() : '');
$id = str_replace('[]', '', $id);
}
if( isset($elements[$id]) ){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <be...@us...> - 2012-06-26 21:56:30
|
Revision: 9731
http://xoops.svn.sourceforge.net/xoops/?rev=9731&view=rev
Author: beckmi
Date: 2012-06-26 21:56:24 +0000 (Tue, 26 Jun 2012)
Log Message:
-----------
Improving bug fix (Philou)
Modified Paths:
--------------
XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
XoopsModules/xforms/branches/mamba/xforms/include/form_render.php
XoopsModules/xforms/trunk/xforms/docs/changelog.txt
XoopsModules/xforms/trunk/xforms/include/form_render.php
Modified: XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 20:56:13 UTC (rev 9730)
+++ XoopsModules/xforms/branches/mamba/xforms/docs/changelog.txt 2012-06-26 21:56:24 UTC (rev 9731)
@@ -3,7 +3,7 @@
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
- adding default strings for localization (cesag/mamba)
-- fixing bug in form_render.php with empty checkbox (cesag/mamba)
+- fixing bug in form_render.php with empty checkbox (cesag/philou)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/branches/mamba/xforms/include/form_render.php
===================================================================
--- XoopsModules/xforms/branches/mamba/xforms/include/form_render.php 2012-06-26 20:56:13 UTC (rev 9730)
+++ XoopsModules/xforms/branches/mamba/xforms/include/form_render.php 2012-06-26 21:56:24 UTC (rev 9731)
@@ -45,7 +45,9 @@
$id = str_replace('ele_', '', $e->getName());
}elseif( method_exists($e, 'getElements') ){
$obj = $e->getElements();
- $id = str_replace('ele_', '', isset($obj[0]) ? $obj[0]->getName() : '');
+ if ( isset($obj[0])){
+ $id = str_replace('ele_', '', $obj[0]->getName());
+ }
$id = str_replace('[]', '', $id);
}
if( isset($elements[$id]) ){
Modified: XoopsModules/xforms/trunk/xforms/docs/changelog.txt
===================================================================
--- XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 20:56:13 UTC (rev 9730)
+++ XoopsModules/xforms/trunk/xforms/docs/changelog.txt 2012-06-26 21:56:24 UTC (rev 9731)
@@ -3,7 +3,7 @@
- fixing some bugs: (black_beard)
- updated to the XOOPS 2.5.x Admin GUI (mamba)
- adding default strings for localization (cesag/mamba)
-- fixing bug in form_render.php with empty checkbox (cesag/mamba)
+- fixing bug in form_render.php with empty checkbox (cesag/philou)
1.20 Dylian (2010-6-30
=================================
Modified: XoopsModules/xforms/trunk/xforms/include/form_render.php
===================================================================
--- XoopsModules/xforms/trunk/xforms/include/form_render.php 2012-06-26 20:56:13 UTC (rev 9730)
+++ XoopsModules/xforms/trunk/xforms/include/form_render.php 2012-06-26 21:56:24 UTC (rev 9731)
@@ -45,7 +45,9 @@
$id = str_replace('ele_', '', $e->getName());
}elseif( method_exists($e, 'getElements') ){
$obj = $e->getElements();
- $id = str_replace('ele_', '', isset($obj[0]) ? $obj[0]->getName() : '');
+ if ( isset($obj[0])){
+ $id = str_replace('ele_', '', $obj[0]->getName());
+ }
$id = str_replace('[]', '', $id);
}
if( isset($elements[$id]) ){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|