Merge branch 'master' of https://github.com/majuca/prado

7 files changed, 30 insertions, 19 deletions

diff --git a/framework/Wsat/pages/TWsatGenerateAR.php b/framework/Wsat/pages/TWsatGenerateAR.php
index 2e7bab06..1677a8ea 100644
--- a/framework/Wsat/pages/TWsatGenerateAR.php
+++ b/framework/Wsat/pages/TWsatGenerateAR.php
@@ -2,9 +2,9 @@
 
 /**
  * @author Daniel Sampedro Bello <darthdaniel85@gmail.com>
- * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2014 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @link https://github.com/pradosoft/prado
+ * @copyright Copyright &copy; 2005-2015 The PRADO Group
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
  * @version $Id$
  * @since 3.3
  * @package Wsat.pages
diff --git a/framework/Wsat/pages/TWsatHome.page b/framework/Wsat/pages/TWsatHome.page
index 2f65a541..3083a39c 100644
--- a/framework/Wsat/pages/TWsatHome.page
+++ b/framework/Wsat/pages/TWsatHome.page
@@ -13,6 +13,7 @@
                                 Enables you to generate all Active Record Classes with relations included.
                         </td>
                 </tr>
+                <!---
                 <tr style="background-color: #cccccc">
                         <td style="padding: 5px; width: 100px">
                                 <com:THyperLink NavigateUrl="<%= $this->Service->constructUrl('TWsatScaffolding') %>" Text="Scaffolding" />
@@ -21,5 +22,6 @@
                                 Enables you to generate a completed CRUD based in DB tables. It allow to choose bootstrap for the view generation.  
                         </td>
                 </tr>
+                --->
         </table>
 </com:TContent>
diff --git a/framework/Wsat/pages/TWsatHome.php b/framework/Wsat/pages/TWsatHome.php
index b4beb07c..6e1b72d9 100644
--- a/framework/Wsat/pages/TWsatHome.php
+++ b/framework/Wsat/pages/TWsatHome.php
@@ -2,9 +2,9 @@
 
 /**
  * @author Daniel Sampedro Bello <darthdaniel85@gmail.com>
- * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2014 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @link https://github.com/pradosoft/prado
+ * @copyright Copyright &copy; 2005-2015 The PRADO Group
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
  * @version $Id$
  * @since 3.3
  * @package Wsat.pages
diff --git a/framework/Wsat/pages/TWsatLogin.page b/framework/Wsat/pages/TWsatLogin.page
index 79578f59..6b9d8456 100644
--- a/framework/Wsat/pages/TWsatLogin.page
+++ b/framework/Wsat/pages/TWsatLogin.page
@@ -20,9 +20,8 @@
             </div>
 
             <div class="mainmenu">
-                <div style="float: right"><com:THyperLink NavigateUrl="http://www.pradosoft.com/" Text="PradoSoft.com" Target="_blank" />&nbsp;|&nbsp;</div>
+                <div style="float: right"><com:THyperLink NavigateUrl="https://github.com/pradosoft/prado" Text="Prado framework" Target="_blank" />&nbsp;|&nbsp;</div>
                 <div style="float: right"><com:THyperLink NavigateUrl="<%= $this->Service->DefaultPageUrl %>" Text="Web App" Target="_blank" />&nbsp;|&nbsp;</div>
-                <div style="float: right"><com:THyperLink NavigateUrl="http://www.pradosoft.com/forum/" Text="Help" Target="_blank" />&nbsp;|&nbsp;</div>
                 <div style="clear: both"></div>
             </div> 
 
@@ -36,7 +35,7 @@
             </div>                       
 
             <div id="footer">
-                Copyright &copy; 2005-<%= date('Y') %> <a href="http://www.pradosoft.com">PradoSoft</a>.
+                Copyright &copy; 2005-<%= date('Y') %> <a href="https://github.com/pradosoft">The PRADO Group</a>.
                 <br/><br/>
                 <%= Prado::poweredByPrado() %>
             </div>
diff --git a/framework/Wsat/pages/TWsatLogin.php b/framework/Wsat/pages/TWsatLogin.php
index 7aa90740..cfd4d560 100644
--- a/framework/Wsat/pages/TWsatLogin.php
+++ b/framework/Wsat/pages/TWsatLogin.php
@@ -2,9 +2,9 @@
 
 /**
  * @author Daniel Sampedro Bello <darthdaniel85@gmail.com>
- * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2014 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @link https://github.com/pradosoft/prado
+ * @copyright Copyright &copy; 2005-2015 The PRADO Group
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
  * @version $Id$
  * @since 3.3
  * @package Wsat.pages
diff --git a/framework/Wsat/pages/TWsatScaffolding.php b/framework/Wsat/pages/TWsatScaffolding.php
index aa7599ca..b4801745 100644
--- a/framework/Wsat/pages/TWsatScaffolding.php
+++ b/framework/Wsat/pages/TWsatScaffolding.php
@@ -2,9 +2,9 @@
 
 /**
  * @author Daniel Sampedro Bello <darthdaniel85@gmail.com>
- * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2014 PradoSoft
- * @license http://www.pradosoft.com/license/
+ * @link https://github.com/pradosoft/prado
+ * @copyright Copyright &copy; 2005-2015 The PRADO Group
+ * @license https://github.com/pradosoft/prado/blob/master/COPYRIGHT
  * @version $Id$
  * @since 3.3
  * @package Wsat.pages
@@ -47,7 +47,16 @@ class TWsatScaffolding extends TPage
                         {
                                 $scf_generator = new TWsatScaffoldingGenerator();
                                 $scf_generator->setOpFile($this->output_folder->Text);
-                                $scf_generator->generateCRUD("estudiante");
+                                foreach ($scf_generator->getAllTableNames() as $tableName)
+                                {
+                                        $id = "cb_$tableName";
+                                        $obj = $this->tableNames->findControl($id);
+                                        if($obj!==null && $obj->Checked)
+                                        {
+                                                $scf_generator->generateCRUD($tableName);
+                                        }
+                                }
+                                
                                 $this->feedback_panel->CssClass = "green_panel";
                                 $this->generation_msg->Text = "The code has been generated successfully.";
                         } catch (Exception $ex)
diff --git a/framework/Wsat/pages/layout/TWsatLayout.tpl b/framework/Wsat/pages/layout/TWsatLayout.tpl
index d91ff333..36ec5bae 100644
--- a/framework/Wsat/pages/layout/TWsatLayout.tpl
+++ b/framework/Wsat/pages/layout/TWsatLayout.tpl
@@ -19,9 +19,8 @@
             
             <div class="mainmenu">
                 <div style="float: right"><com:TLinkButton Text="Logout" OnClick="logout" /></div>
-                <div style="float: right"><com:THyperLink NavigateUrl="http://www.pradosoft.com/" Text="PradoSoft.com" Target="_blank" />&nbsp;|&nbsp;</div>
+                <div style="float: right"><com:THyperLink NavigateUrl="https://github.com/pradosoft/prado" Text="Prado framework" Target="_blank" />&nbsp;|&nbsp;</div>
                 <div style="float: right"><com:THyperLink NavigateUrl="<%= $this->Service->DefaultPageUrl %>" Text="Web App" Target="_blank" />&nbsp;|&nbsp;</div>
-                <div style="float: right"><com:THyperLink NavigateUrl="http://www.pradosoft.com/forum/" Text="Help" Target="_blank" />&nbsp;|&nbsp;</div>
                 <div style="clear: both"></div>
             </div> 
             
@@ -31,7 +30,9 @@
                         <div>Code Generation</div>
                         <ul>
                             <li><com:THyperLink NavigateUrl="<%= $this->Service->constructUrl('TWsatGenerateAR') %>" Text="AR Classes" /></li>
+                            <!---
                             <li><com:THyperLink NavigateUrl="<%= $this->Service->constructUrl('TWsatScaffolding') %>" Text="Scaffolding" /></li>
+                            --->
                         </ul>
                     </div>
                 </div>            
@@ -44,7 +45,7 @@
             </div>            
             
             <div id="footer">
-                Copyright &copy; 2005-<%= date('Y') %> <a href="http://www.pradosoft.com">PradoSoft</a>.
+                Copyright &copy; 2005-<%= date('Y') %> <a href="https://github.com/pradosoft">The PRADO Group</a>.
                 <br/><br/>
                 <%= Prado::poweredByPrado() %>
             </div>