xoops-svn

[xoops-svn] SF.net SVN: xoops:[9557] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ system/class/form/preference.php

[<be...@us...>]

Revision: 9557
          http://xoops.svn.sourceforge.net/xoops/?rev=9557&view=rev
Author:   beckmi
Date:     2012-05-20 04:37:58 +0000 (Sun, 20 May 2012)
Log Message:
-----------
Changing _GO to _SUBMIT

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php	2012-05-20 04:31:40 UTC (rev 9556)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php	2012-05-20 04:37:58 UTC (rev 9557)
@@ -229,7 +229,7 @@
             unset($hidden);
         }
         $this->addElement(new XoopsFormHidden('op', 'save'));
-        $this->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
+        $this->addElement(new XoopsFormButton('', 'button', _SUBMIT, 'submit'));
     }
 
     /**
@@ -363,6 +363,6 @@
             }
         }
         $this->addElement(new XoopsFormHidden('op', 'save'));
-        $this->addElement(new XoopsFormButton('', 'button', _GO, 'submit'));
+        $this->addElement(new XoopsFormButton('', 'button', _SUBMIT, 'submit'));
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[xoops-svn] SF.net SVN: xoops:[9561] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/ system/class/form/preference.php

[<ma...@us...>]

Revision: 9561
          http://xoops.svn.sourceforge.net/xoops/?rev=9561&view=rev
Author:   mageg
Date:     2012-05-20 12:46:50 +0000 (Sun, 20 May 2012)
Log Message:
-----------
The description is no longer displayed with the title to the preferences of modules / plugins

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php	2012-05-20 12:36:17 UTC (rev 9560)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/class/form/preference.php	2012-05-20 12:46:50 UTC (rev 9561)
@@ -39,7 +39,7 @@
     {
         $xoops = Xoops::getInstance();
         $config_handler = $xoops->getHandlerConfig();
-        
+
         parent::__construct(constant($obj->getVar('confcat_name')), 'pref_form', 'admin.php?fct=preferences', 'post', true);
 
         $criteria = new CriteriaCompo();
@@ -48,7 +48,7 @@
         $config = $config_handler->getConfigs($criteria);
         $count = count($config);
         for ($i = 0; $i < $count; $i++) {
-            
+
             $title = constant($config[$i]->getVar('conf_title'));
             $desc = ($config[$i]->getVar('conf_desc') != '') ? constant($config[$i]->getVar('conf_desc')) : '';
 
@@ -263,9 +263,8 @@
         }
         $count = count($obj);
         for ($i = 0; $i < $count; $i++) {
-            $title = (!defined($obj[$i]->getVar('conf_desc')) || constant($obj[$i]->getVar('conf_desc')) == '')
-                    ? constant($obj[$i]->getVar('conf_title'))
-                    : constant($obj[$i]->getVar('conf_title')) . '<br /><br /><span style="font-weight:normal;">' . constant($obj[$i]->getVar('conf_desc')) . '</span>';
+            $title = constant($obj[$i]->getVar('conf_title'));
+            $desc = ($obj[$i]->getVar('conf_desc') != '') ? constant($obj[$i]->getVar('conf_desc')) : '';
             switch ($obj[$i]->getVar('conf_formtype')) {
 
                 case 'textarea':
@@ -357,6 +356,7 @@
             $hidden = new XoopsFormHidden('conf_ids[]', $obj[$i]->getVar('conf_id'));
             if (isset($ele)) {
                 $this->addElement($ele);
+                $ele->setDescription($desc);
                 $this->addElement($hidden);
                 unset($ele);
                 unset($hidden);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.