]> git.ipfire.org Git - thirdparty/bacula.git/commitdiff
baculum: Adapt Web and API to new framework version
authorMarcin Haba <marcin.haba@bacula.pl>
Sun, 22 Apr 2018 19:40:16 +0000 (21:40 +0200)
committerMarcin Haba <marcin.haba@bacula.pl>
Mon, 23 Apr 2018 16:07:41 +0000 (18:07 +0200)
27 files changed:
gui/baculum/index.php
gui/baculum/protected/API/Class/APIUrlMapping.php
gui/baculum/protected/API/Class/Database.php
gui/baculum/protected/Web/Class/WebUrlMapping.php
gui/baculum/protected/Web/Pages/RestoreWizard.page
gui/baculum/protected/Web/Pages/RestoreWizard.php
gui/baculum/protected/Web/Pages/StorageView.page
gui/baculum/protected/Web/Pages/Users.page
gui/baculum/protected/Web/Portlets/BConditional.php
gui/baculum/protected/Web/Portlets/BaculaConfigComponents.php
gui/baculum/protected/Web/Portlets/BaculaConfigComponents.tpl
gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.php
gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.tpl
gui/baculum/protected/Web/Portlets/BaculaConfigResources.php
gui/baculum/protected/Web/Portlets/BaculaConfigResources.tpl
gui/baculum/protected/Web/Portlets/BaculaHosts.php
gui/baculum/protected/Web/Portlets/BaculaHosts.tpl
gui/baculum/protected/Web/Portlets/DirectiveFileSet.php
gui/baculum/protected/Web/Portlets/DirectiveFileSet.tpl
gui/baculum/protected/Web/Portlets/DirectiveMessages.php
gui/baculum/protected/Web/Portlets/DirectiveMessages.tpl
gui/baculum/protected/Web/Portlets/DirectiveRunscript.php
gui/baculum/protected/Web/Portlets/DirectiveRunscript.tpl
gui/baculum/protected/Web/Portlets/MessageTypes.php
gui/baculum/protected/Web/Portlets/Users.tpl
gui/baculum/protected/application.xml
gui/baculum/themes/Baculum-v2/restore-wizard.css

index 054752f3994993699b9aa50be92cf9e88797272d..dcff5387c2b353a100a2fbbc450c172214e7f261 100644 (file)
@@ -26,9 +26,7 @@
  */
 define('APPLICATION_DIRECTORY', __DIR__);
 
-require_once('./framework/prado.php');
-
-// Start application
-$application=new TApplication;
+require 'framework/autoload.php';
+$application = new \Prado\TApplication;
 $application->run();
 ?>
index c07af0c842ad3140a06a545c8cdb548ce1444aaa..5d4ba9c2a083200b1eba8dc169b31507eaad8e88 100644 (file)
@@ -26,7 +26,7 @@ class APIUrlMapping extends TUrlMappingPattern {
 
        const SERVICE_ID = 'api';
 
-       public function __construct(TUrlManager $manager) {
+       public function __construct(BaculumUrlMapping $manager) {
                parent::__construct($manager);
                $this->setServiceID(self::SERVICE_ID);
        }
index be46e4f7b636aaa30ae9b450bdf266c4df549b26..eea4cef3b027d2b3d233f931148b8dfdaa0296a1 100644 (file)
@@ -20,7 +20,6 @@
  * Bacula(R) is a registered trademark of Kern Sibbald.
  */
  
-Prado::using('System.interfaces');
 Prado::using('Application.Common.Class.Errors');
 Prado::using('Application.API.Class.BException');
 Prado::using('Application.API.Class.APIModule');
index dd1068d68f83c8e63d73fbfc4876a6178b5a9e53..89cb6c43502fe5e93a06b608848bafc243bec6da 100644 (file)
@@ -26,7 +26,7 @@ class WebUrlMapping extends TUrlMappingPattern {
 
        const SERVICE_ID = 'web';
 
-       public function __construct(TUrlManager $manager) {
+       public function __construct(BaculumUrlMapping $manager) {
                parent::__construct($manager);
                $this->setServiceID(self::SERVICE_ID);
        }
index 289bf9e9bcb62a953f256acf1c3f4eb4f2f44ca8..100c330546f704c6c2a23ede906b006313c3f2c6 100644 (file)
@@ -344,7 +344,8 @@ oJobsToRestoreList.init();
                                                        ShowHeader="false"
                                                        CssClass="file-browser-detail"
                                                        ItemStyle.CssClass="file-browser-element"
-                                                       DataKeyField="fileid">
+                                                       DataKeyField="fileid"
+                                                       >
                                                                <prop:EmptyTemplate>
                                                                        <div class="file-browser-watermark" style="padding: 200px 10px">
                                                                                <%[ It seems that there is no files for choosing or file records in database for this job has been purged (file retention period expired) ]%>
@@ -352,7 +353,7 @@ oJobsToRestoreList.init();
                                                                </prop:EmptyTemplate>
                                                                <com:TActiveTemplateColumn>
                                                                        <prop:ItemTemplate>
-                                                                               <com:TDraggable ID="FileElementLeft" Revert="false" Handle="<%=$this->FileElementLeft->ClientID%>" Ghosting="true" CssClass="draggable">
+                                                                               <com:TPanel ID="FileElementLeft" CssClass="draggable">
                                                                                        <img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/<%=($this->getParent()->Data['type'] == 'dir' ? 'directory-icon' : 'file-icon')%>.png" alt="<%=$this->getParent()->Data['type'] == 'dir' ? 'directory' : 'file' %>" /> <%=($this->getParent()->Data['name'] != '/') ? preg_replace('/\/$/', '', $this->getParent()->Data['name']) : '/'%>
                                                                                <div class="restore-browser-element-size">
                                                                                        <com:TActiveLinkButton
@@ -362,33 +363,13 @@ oJobsToRestoreList.init();
                                                                                                ActiveControl.CallbackParameter="<%=isset($this->getParent()->Data['fileid']) ? $this->getParent()->Data['fileid'] : null%>"
                                                                                                ActiveControl.EnableUpdate="false"
                                                                                                Visible="<%=!in_array($this->getParent()->Data['name'], $this->getPage()->excluded_elements_from_add)%>"
+                                                                                               ClientSide.OnComplete="Formatters.set_formatters();"
                                                                                                Text="<%[ Add ]%>"
                                                                                        />
                                                                                        <span class="size" style=""><%=isset($this->getParent()->Data['lstat']['size']) ? $this->getParent()->Data['lstat']['size'] : '0'%></span>
                                                                                </div>
-                                                                               </com:TDraggable>
-                                                                               <com:TCallback ID="FileElementCall" OnCallback="Page.getVersions" ActiveControl.CallbackParameter="<%=$this->getParent()->Data['name'] . '|' . @$this->getParent()->Data['pathid'] . '|' . @$this->getParent()->Data['filenameid'] . '|' . @$this->getParent()->Data['jobid']%>">
-                                                                                       <prop:ClientSide.OnLoading>
-                                                                                               document.getElementById('restore-browser-files-loading').style.display = 'block';
-                                                                                       </prop:ClientSide.OnLoading>
-                                                                                       <prop:ClientSide.OnComplete>
-                                                                                               document.getElementById('restore-browser-files-loading').style.display = 'none';
-                                                                                       </prop:ClientSide.OnComplete>
-                                                                               </com:TCallback>
+                                                                               </com:TPanel>
                                                                                <script type="text/javascript">
-                                                                                       Formatters.set_formatters();
-                                                                                       document.getElementById('<%=$this->FileElementLeft->ClientID%>').addEventListener('mouseup', function(event) {
-                                                                                               var el = event.target || event.srcElement;
-                                                                                               if (el) {
-                                                                                                   el.style.position = 'static';
-                                                                                                   el.style.top = '-1px';
-                                                                                                   el.style.left = '-1px';
-                                                                                               }
-                                                                                               var fel = document.getElementById('<%=$this->FileElementLeft->ClientID%>');
-                                                                                               fel.style.position = 'static';
-                                                                                               fel.style.top = '-1px';
-                                                                                               fel.style.left = '-1px';
-                                                                                       });
                                                                                        document.getElementById('<%=$this->FileElementLeft->ClientID%>').addEventListener('click', function(event) {
                                                                                                var el = event.target || event.srcElement;
                                                                                                if (el.className == 'link') {
@@ -399,7 +380,14 @@ oJobsToRestoreList.init();
                                                                                                if(vposition == null || vposition == '0px'){
                                                                                                        event.stop();
                                                                                                } else {
-                                                                                                       var request = <%=$this->FileElementCall->ActiveControl->Javascript %>;
+                                                                                                       var cbp = "<%=$this->getParent()->Data['name']%>|<%=@$this->getParent()->Data['pathid']%>|<%=@$this->getParent()->Data['filenameid']%>|<%=@$this->getParent()->Data['jobid']%>";
+                                                                                                       var request = <%=$this->getPage()->FileElementCall->ActiveControl->Javascript %>;
+                                                                                                       request.setCallbackParameter(cbp);
+                                                                                                       var ocf = request.options.onComplete;
+                                                                                                       request.options.onComplete = function() {
+                                                                                                               ocf();
+                                                                                                               make_draggable();
+                                                                                                       };
                                                                                                        request.dispatch();
                                                                                                }
                                                                                        });
@@ -407,10 +395,18 @@ oJobsToRestoreList.init();
                                                                        </prop:ItemTemplate>
                                                                </com:TActiveTemplateColumn>
                                                </com:TActiveDataGrid>
+                                               <com:TCallback ID="FileElementCall" OnCallback="Page.getVersions">
+                                                       <prop:ClientSide.OnLoading>
+                                                               document.getElementById('restore-browser-files-loading').style.display = 'block';
+                                                       </prop:ClientSide.OnLoading>
+                                                       <prop:ClientSide.OnComplete>
+                                                               document.getElementById('restore-browser-files-loading').style.display = 'none';
+                                                       </prop:ClientSide.OnComplete>
+                                               </com:TCallback>
                                                </div>
                                        </td>
                                        <td>
-                                               <div id="restore-browser-versions" class="w3-border">
+                                               <div id="restore-browser-versions" class="w3-border" style="position: relative">
                                                        <com:TActiveDataGrid
                                                                ID="VersionsDataGrid"
                                                                ShowHeader="false"
@@ -427,7 +423,7 @@ oJobsToRestoreList.init();
                                                                </prop:EmptyTemplate>
                                                                <com:TActiveTemplateColumn>
                                                                        <prop:ItemTemplate>
-                                                                               <com:TDraggable ID="FileElementToRestore" Revert="false" Handle="<%=$this->FileElementToRestore->ClientID%>" Ghosting="true" CssClass="draggable" Style="width: 100%; height: 28px;">
+                                                                               <com:TPanel ID="FileElementToRestore" CssClass="draggable" Style="height: 28px;">
                                                                                        <span class="w3-third">
                                                                                                <img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/<%=($this->getParent()->Data['type'] == 'dir' ? 'directory-icon' : 'file-icon')%>.png" alt="<%=$this->getParent()->Data['type'] == 'dir' ? 'directory' : 'file'%>" />
                                                                                                 <%=$this->getParent()->Data['name']%>
@@ -444,12 +440,12 @@ oJobsToRestoreList.init();
                                                                                                OnCallback="Page.addFileToRestore"
                                                                                                ActiveControl.CallbackParameter="<%=isset($this->getParent()->Data['fileid']) ? $this->getParent()->Data['fileid'] : false%>"
                                                                                                ActiveControl.EnableUpdate="false"
+                                                                                               ClientSide.OnComplete="Formatters.set_formatters();"
                                                                                                Text="<%[ Add ]%>"
                                                                                        />
                                                                                        </span>
-                                                                               </com:TDraggable>
+                                                                               </com:TPanel>
                                                                                <script type="text/javascript">
-                                                                                       Formatters.set_formatters();
                                                                                        document.getElementById('<%=$this->FileElementToRestore->ClientID%>').addEventListener('mouseover', function(event) {
                                                                                                var tip_fields = [
                                                                                                        '<%[ JobId: ]%> <%=$this->getParent()->Data['jobid']%>',
@@ -459,18 +455,6 @@ oJobsToRestoreList.init();
                                                                                                ];
                                                                                                showTip(this, '<%=$this->getParent()->Data['name']%>', tip_fields.join('<br />'));
                                                                                        });
-                                                                                       document.getElementById('<%=$this->FileElementToRestore->ClientID%>').addEventListener('mouseup', function(event) {
-                                                                                               var el = event.target || event.srcElement;
-                                                                                               if (el) {
-                                                                                                       el.style.position = 'static';
-                                                                                                       el.style.top = 0;
-                                                                                                       el.style.left = 0;
-                                                                                               }
-                                                                                               var fetr = document.getElementById('<%=$this->FileElementToRestore->ClientID%>');
-                                                                                               fetr.style.position = 'static';
-                                                                                               fetr.style.top = 0;
-                                                                                               fetr.style.left = 0;
-                                                                                       });
                                                                                </script>
                                                                        </prop:ItemTemplate>
                                                                </com:TActiveTemplateColumn>
@@ -481,8 +465,8 @@ oJobsToRestoreList.init();
                                <tr>
                                        <td style="vertical-align: bottom;">
                                                <div id="restore-browser-selected" class="w3-border">
-                                                       <com:TDropContainer ID="SelectedVersionsDropper" Height="100%" Width="100%"
-                                                               AcceptCssClass="draggable"
+                                                       <com:TJuiDroppable ID="SelectedVersionsDropper" Height="100%" Width="100%"
+                                                               Options.accept=".draggable"
                                                                OnDrop="addFileToRestore"
                                                                OnCallback="refreshSelectedFiles"
                                                                >
@@ -496,7 +480,7 @@ oJobsToRestoreList.init();
                                                                                DataKeyField="fileid"
                                                                        >
                                                                        <prop:EmptyTemplate>
-                                                                               <div class="file-browser-watermark" style="padding: 110px 10px">
+                                                                               <div class="file-browser-watermark" style="padding: 50px 10px">
                                                                                        <%[ For add a file to restore please click 'Add' link or drag a file from frame on left or from above frame and drop it here ]%>
                                                                                </div>
                                                                        </prop:EmptyTemplate>
@@ -515,13 +499,10 @@ oJobsToRestoreList.init();
                                                                                                                <com:TActiveImageButton CssClass="w3-right" ImageUrl="<%=$this->getPage()->getTheme()->getBaseUrl()%>/icon_close.png" OnCallback="Page.removeSelectedFile" ActiveControl.CallbackParameter="<%=isset($this->getParent()->Data['fileid']) ? $this->getParent()->Data['fileid'] : ''%>"/>
                                                                                                        </span>
                                                                                                </com:TPanel>
-                                                                                               <script type="text/javascript">
-                                                                                                       Formatters.set_formatters();
-                                                                                               </script>
                                                                                </prop:ItemTemplate>
                                                                        </com:TActiveTemplateColumn>
                                                                        </com:TActiveDataGrid>
-                                                               </com:TDropContainer>
+                                                               </com:TJuiDroppable>
                                                </div>
                                        </td>
                                </tr>
@@ -530,6 +511,15 @@ oJobsToRestoreList.init();
                                var browser = document.getElementById('restore-browser-files');
                                document.getElementById('restore-browser-files-loading').style.width = browser.offsetWidth + 'px';
                                document.getElementById('restore-browser-files-loading').style.height = browser.offsetHeight + 'px';
+                               function make_draggable() {
+                                       $('.draggable').draggable({
+                                               'helper':"clone",
+                                               'scroll':false,
+                                               'appendTo':"body",
+                                               'containment':"window"
+                                       });
+                               }
+                               make_draggable('<%=$this->getPage()->DataGridFiles->ClientID%>');
                        </script>
                </com:TWizardStep>
                <com:TWizardStep ID="Step4" Title="<%[ Step 4 - select destination for restore ]%>" StepType="Auto">
@@ -557,8 +547,8 @@ oJobsToRestoreList.init();
                                </prop:HeaderTemplate>
                                <prop:ItemTemplate>
                                                <tr>
-                                                       <td class="center"><com:TLabel Text="<%#($this->DataItem['inchanger'] == 1 ? Prado::localize('Yes') : Prado::localize('No'))%>" /></td>
-                                                       <td> <i class="fa fa-hdd w3-text-black"></i> <com:TLabel Text="<%#$this->DataItem['volume']%>" /></td>
+                                                       <td class="center"><com:TLabel Text="<%#($this->Data['inchanger'] == 1 ? Prado::localize('Yes') : Prado::localize('No'))%>" /></td>
+                                                       <td> <i class="fa fa-hdd w3-text-black"></i> <com:TLabel Text="<%#$this->Data['volume']%>" /></td>
                                                </tr>
                                </prop:ItemTemplate>
                                <prop:FooterTemplate>
index 8e023cae3de9bd49aff46d0016575d3dd6c767ca..b92b480833e63962e4752095423c18306f16f282 100644 (file)
@@ -24,11 +24,11 @@ Prado::using('Application.Web.Class.BaculumWebPage');
 Prado::using('System.Exceptions.TException');
 Prado::using('System.Web.UI.WebControls.TWizard');
 Prado::using('System.Web.UI.WebControls.TDataGrid');
+Prado::using('System.Web.UI.JuiControls.TJuiDroppable');
 Prado::using('System.Web.UI.ActiveControls.TActiveLinkButton');
 Prado::using('System.Web.UI.ActiveControls.TActiveImageButton');
-Prado::using('System.Web.UI.ActiveControls.TDropContainer');
-Prado::using('System.Web.UI.ActiveControls.TDraggable');
 Prado::using('System.Web.UI.ActiveControls.TActiveDataGrid');
+Prado::using('System.Web.UI.ActiveControls.TActiveRepeater');
 Prado::using('System.Web.UI.ActiveControls.TCallback');
 Prado::using('System.Web.UI.ActiveControls.TActiveTextBox');
 
@@ -486,17 +486,17 @@ class RestoreWizard extends BaculumWebPage
                $fileid = null;
                $source_element_id = null;
                $file_prop = array();
-               if (isset($param->CallbackParameter)) {
+               if (get_class($param) == 'Prado\Web\UI\ActiveControls\TCallbackEventParameter') {
                        $id_parts = explode('_', $sender->ClientID, 6);
                        $source_element_id = $id_parts[3];
                        $fileid = $param->CallbackParameter;
                } else {
-                       $control = $param->getDroppedControl();
+                       $control = $param->DraggableControl;
                        $item = $control->getNamingContainer();
-                       $id_parts = explode('_', $param->getDragElementID(), 6);
+                       $id_parts = explode('_', $control->ClientID, 6);
                        $source_element_id = $id_parts[3];
                }
-               if($source_element_id == $this->VersionsDataGrid->ID) {
+               if ($source_element_id == $this->VersionsDataGrid->ID) {
                        if (is_null($fileid)) {
                                $fileid = $this->VersionsDataGrid->getDataKeys()->itemAt($item->getItemIndex());
                        }
index 466b11181456e1fbb618cd77bbb7e79182d8d953..2f4cbc7e5e5ac964cf5a79e824727c078176ef83 100644 (file)
                        </prop:HeaderTemplate>
                        <prop:ItemTemplate>
                                <tr>
-                                       <td><%#$this->DataItem%></td>
+                                       <td><%#$this->Data%></td>
                                        <td><%=$this->TemplateControl->IsAutochanger ? $this->TemplateControl->getDeviceName() : '-'%></td>
-                                       <td class="w3-center"><button type="button" class="w3-button w3-green" onclick="document.location.href='<%=$this->Service->constructUrl('DeviceView', array('storageid' => $this->TemplateControl->getStorageId(), 'device' => $this->DataItem))%>';"><i class="fa fa-list-ul"></i> &nbsp;<%[ Details ]%></button></td>
+                                       <td class="w3-center"><button type="button" class="w3-button w3-green" onclick="document.location.href='<%=$this->Service->constructUrl('DeviceView', array('storageid' => $this->TemplateControl->getStorageId(), 'device' => $this->Data))%>';"><i class="fa fa-list-ul"></i> &nbsp;<%[ Details ]%></button></td>
                                </tr>
                        </prop:ItemTemplate>
                        <prop:FooterTemplate>
index f92d7a3d3383ab6d6d5af53026a672711196e484..13f85fa031d99c6cec2a892182c18ba1e5953e5e 100644 (file)
        </prop:HeaderTemplate>
        <prop:ItemTemplate>
                <tr class="slide-window-element">
-                       <td><%=$this->DataItem['user']%></td>
-                       <td><%=$this->DataItem['admin'] ? Prado::localize('Administrator') :  Prado::localize('Normal user')%></td>
+                       <td><%=$this->Data['user']%></td>
+                       <td><%=$this->Data['admin'] ? Prado::localize('Administrator') :  Prado::localize('Normal user')%></td>
                        <td>
-                               <com:TPanel Visible="<%=$this->DataItem['admin']%>" Style="line-height: 29px">
+                               <com:TPanel Visible="<%=$this->Data['admin']%>" Style="line-height: 29px">
                                        Main
                                </com:TPanel>
-                               <com:TPanel Visible="<%=!$this->DataItem['admin']%>">
-                                               <select rel="user_host" onchange="Users.set_host('<%=$this->DataItem['user']%>', this);" class="w3-select w3-border" style="width: 85%; float: left;">
+                               <com:TPanel Visible="<%=!$this->Data['admin']%>">
+                                               <select rel="user_host" onchange="Users.set_host('<%=$this->Data['user']%>', this);" class="w3-select w3-border" style="width: 85%; float: left;">
                                                        <com:TRepeater OnInit="SourceTemplateControl.initHosts">
                                                                <prop:HeaderTemplate>
                                                        <option value=""><%[ Select host ]%></option>
                                                                </prop:HeaderTemplate>
                                                                <prop:ItemTemplate>
-                                                       <option value="<%=$this->DataItem%>" <%=$this->SourceTemplateControl->isSelectedHost($this->Parent->Parent->Parent->DataItem['user'], $this->DataItem) ? 'selected' : ''%>><%=$this->DataItem%></option>
+                                                       <option value="<%=$this->Data%>" <%=$this->SourceTemplateControl->isSelectedHost($this->Parent->Parent->Parent->Data['user'], $this->Data) ? 'selected' : ''%>><%=$this->Data%></option>
                                                                </prop:ItemTemplate>
                                                        </com:TRepeater>
                                                </select>
@@ -70,7 +70,7 @@
                                </com:TPanel>
                        </td>
                        <td>
-                               <a href="javascript:void(0)" class="w3-button w3-green"  <%=$this->DataItem['admin'] ? 'style="visibility: hidden"' : ''%> onclick="Users.rmUser('<%=$this->DataItem['user']%>')">
+                               <a href="javascript:void(0)" class="w3-button w3-green"  <%=$this->Data['admin'] ? 'style="visibility: hidden"' : ''%> onclick="Users.rmUser('<%=$this->Data['user']%>')">
                                        <i class="fa fa-trash-alt"></i> &nbsp;<%[ Remove user ]%>
                                </a>
                                <a href="javascript:void(0)" class="w3-button w3-green" onclick="Users.showChangePwd(this)" rel="chpwd_btn">
@@ -79,8 +79,8 @@
                                <span style="display: none;" rel="chpwd">
                                        <div class="w3-threequarter w3-section">
                                                <%[ Password: ]%>
-                                               <input type="password" onkeydown="event.keyCode == 13 ? Users.changePwd(this, '<%=$this->DataItem['user']%>') : (event.keyCode == 27 ? Users.cancelChangePwd(this.nextElementSibling.nextElementSibling) : '');" class="w3-input w3-border" />
-                                               <a href="javascript:void(0)" onclick="Users.changePwd(this.previousElementSibling, '<%=$this->DataItem['user']%>')" class="w3-button w3-green w3-margin-top">
+                                               <input type="password" onkeydown="event.keyCode == 13 ? Users.changePwd(this, '<%=$this->Data['user']%>') : (event.keyCode == 27 ? Users.cancelChangePwd(this.nextElementSibling.nextElementSibling) : '');" class="w3-input w3-border" />
+                                               <a href="javascript:void(0)" onclick="Users.changePwd(this.previousElementSibling, '<%=$this->Data['user']%>')" class="w3-button w3-green w3-margin-top">
                                                        <i class="fa fa-save"></i> &nbsp;<%[ Save ]%>
                                                </a>
                                                <a href="javascript:void(0)" onclick="Users.cancelChangePwd(this)" class="w3-button w3-red w3-margin-top">
index 329a1b0433d341090f27db1955e2d52c7a12e1fb..dc3621345585939c8da6fdb4b405dfbdadc61df5 100644 (file)
@@ -46,8 +46,8 @@ class BConditional extends TTemplateControl implements IActiveControl {
                parent::onLoad($param);
        }
 
-       public function bubbleEvent($sender,$param) {
-               if ($param instanceof TCommandEventParameter) {
+       public function bubbleEvent($sender, $param) {
+               if ($param instanceof Prado\Web\UI\TCommandEventParameter) {
                        $this->raiseBubbleEvent($this, $param);
                        return true;
                } else {
@@ -91,7 +91,7 @@ class BConditional extends TTemplateControl implements IActiveControl {
        }
 
        public function setTrueTemplate($template) {
-               if ($template instanceof ITemplate) {
+               if ($template instanceof Prado\Web\UI\ITemplate) {
                        $this->item_true_template = $template;
                }
        }
@@ -101,7 +101,7 @@ class BConditional extends TTemplateControl implements IActiveControl {
        }
 
        public function setFalseTemplate($template) {
-               if ($template instanceof ITemplate) {
+               if ($template instanceof Prado\Web\UI\ITemplate) {
                        $this->item_false_template = $template;
                }
        }
@@ -112,8 +112,7 @@ class BConditional extends TTemplateControl implements IActiveControl {
        }
 
        public function getBCondition() {
-               $value = $this->getViewState(self::BCONDITION);
-               return $value;
+               return $this->getViewState(self::BCONDITION);
        }
 
        public function dataBind() {
@@ -151,7 +150,7 @@ class BConditionalItem extends TTemplateControl implements IDataRenderer, INamin
        }
 
        public function bubbleEvent($sender,$param) {
-               if ($param instanceof TCommandEventParameter) {
+               if ($param instanceof Prado\Web\UI\TCommandEventParameter) {
                        $this->raiseBubbleEvent($this, $param);
                        return true;
                } else {
index c0872e3f16a86e01606de33829d53517521a3e51..dba176a42e53f07448c351c02aa72db6f5e0962b 100644 (file)
@@ -67,9 +67,9 @@ class BaculaConfigComponents extends ComponentListTemplate {
                for ($i = 0; $i < count($controls); $i++) {
                        $control = $this->getChildControl($param->Item, $controls[$i]);
                        if (is_object($control)) {
-                               $control->setHost($param->Item->DataItem['host']);
-                               $control->setComponentType($param->Item->DataItem['component_type']);
-                               $control->setComponentName($param->Item->DataItem['component_name']);
+                               $control->setHost($param->Item->Data['host']);
+                               $control->setComponentType($param->Item->Data['component_type']);
+                               $control->setComponentName($param->Item->Data['component_name']);
                        }
                }
        }
index 24b5892c64a7bc0ca553f072afc43172e7ba963c..425fc6450d5963a0ddea7b5a7a198ef0b823aabd 100644 (file)
@@ -12,7 +12,7 @@
                                                        ClientSide.OnLoading="BaculaConfig.loader_start(sender.options.ID);"
                                                        ClientSide.OnComplete="BaculaConfig.set_config_items(sender.options.ID);"
                                                        Attributes.onclick="return BaculaConfig.unset_config_items(this.id);"
-                                                       Text="<strong><%=$this->DataItem['label']%></strong>: <%=$this->DataItem['component_name']%>"
+                                                       Text="<strong><%=$this->Data['label']%></strong>: <%=$this->Data['component_name']%>"
                                                        Style="text-decoration: none"
                                                />
                                                        <i class="fa fa-sync w3-spin" style="display: none"><i/>
index 8751269c62c1527320da8e44ee42fc8c8cb11fac..ebab4ebb0df762b8d2df398837674886a0eb82b1 100644 (file)
@@ -34,7 +34,6 @@ Prado::using('Application.Web.Portlets.DirectiveText');
 Prado::using('Application.Web.Portlets.DirectiveTimePeriod');
 Prado::using('Application.Web.Portlets.DirectiveRunscript');
 Prado::using('Application.Web.Portlets.DirectiveMessages');
-Prado::using('Application.IO.TTextWriter');
 
 class BaculaConfigDirectives extends DirectiveListTemplate {
 
@@ -207,20 +206,20 @@ class BaculaConfigDirectives extends DirectiveListTemplate {
                for ($i = 0; $i < count($this->directive_types); $i++) {
                        $control = $this->getChildControl($param->Item, $this->directive_types[$i]);
                        if (is_object($control)) {
-                               $control->setHost($param->Item->DataItem['host']);
-                               $control->setComponentType($param->Item->DataItem['component_type']);
-                               $control->setComponentName($param->Item->DataItem['component_name']);
-                               $control->setResourceType($param->Item->DataItem['resource_type']);
-                               $control->setResourceName($param->Item->DataItem['resource_name']);
-                               $control->setDirectiveName($param->Item->DataItem['directive_name']);
-                               $control->setDirectiveValue($param->Item->DataItem['directive_value']);
-                               $control->setDefaultValue($param->Item->DataItem['default_value']);
-                               $control->setRequired($param->Item->DataItem['required']);
-                               $control->setData($param->Item->DataItem['data']);
-                               $control->setResource($param->Item->DataItem['resource']);
-                               $control->setLabel($param->Item->DataItem['label']);
-                               $control->setInConfig($param->Item->DataItem['in_config']);
-                               $show_all_directives = ($param->Item->DataItem['in_config'] || !$load_values || $this->getShowAllDirectives());
+                               $control->setHost($param->Item->Data['host']);
+                               $control->setComponentType($param->Item->Data['component_type']);
+                               $control->setComponentName($param->Item->Data['component_name']);
+                               $control->setResourceType($param->Item->Data['resource_type']);
+                               $control->setResourceName($param->Item->Data['resource_name']);
+                               $control->setDirectiveName($param->Item->Data['directive_name']);
+                               $control->setDirectiveValue($param->Item->Data['directive_value']);
+                               $control->setDefaultValue($param->Item->Data['default_value']);
+                               $control->setRequired($param->Item->Data['required']);
+                               $control->setData($param->Item->Data['data']);
+                               $control->setResource($param->Item->Data['resource']);
+                               $control->setLabel($param->Item->Data['label']);
+                               $control->setInConfig($param->Item->Data['in_config']);
+                               $show_all_directives = ($param->Item->Data['in_config'] || !$load_values || $this->getShowAllDirectives());
                                $control->setShow($show_all_directives);
                                $control->setResourceNames($this->resource_names);
                                break;
@@ -229,13 +228,13 @@ class BaculaConfigDirectives extends DirectiveListTemplate {
                for ($i = 0; $i < count($this->directive_list_types); $i++) {
                        $control = $this->getChildControl($param->Item, $this->directive_list_types[$i]);
                        if (is_object($control)) {
-                               $control->setHost($param->Item->DataItem['host']);
-                               $control->setComponentType($param->Item->DataItem['component_type']);
-                               $control->setComponentName($param->Item->DataItem['component_name']);
-                               $control->setResourceType($param->Item->DataItem['resource_type']);
-                               $control->setResourceName($param->Item->DataItem['resource_name']);
-                               $control->setDirectiveName($param->Item->DataItem['directive_name']);
-                               $control->setData($param->Item->DataItem['directive_value']);
+                               $control->setHost($param->Item->Data['host']);
+                               $control->setComponentType($param->Item->Data['component_type']);
+                               $control->setComponentName($param->Item->Data['component_name']);
+                               $control->setResourceType($param->Item->Data['resource_type']);
+                               $control->setResourceName($param->Item->Data['resource_name']);
+                               $control->setDirectiveName($param->Item->Data['directive_name']);
+                               $control->setData($param->Item->Data['directive_value']);
                                $control->setLoadValues($this->getLoadValues());
                                $control->setResourceNames($this->resource_names);
                                $control->setShow(true);
index 45295a2dc63bbebf8afdc435b3b6e05dfc3dc4de..4d6da117bb3aaae7e0afe8062430793cb93e30bf 100644 (file)
                >
                <prop:ItemTemplate>
                        <div class="directive_field">
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'TextBox')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'TextBox')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveText />
                                        </prop:TrueTemplate>
                                </com:Application.Web.Portlets.BConditional>
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'Integer')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'Integer')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveInteger />
                                        </prop:TrueTemplate>
                                </com:Application.Web.Portlets.BConditional>
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'CheckBox')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'CheckBox')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveBoolean />
                                        </prop:TrueTemplate>
                                </com:Application.Web.Portlets.BConditional>
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'TimePeriod')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'TimePeriod')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveTimePeriod />
                                        </prop:TrueTemplate>
                                </com:Application.Web.Portlets.BConditional>
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'ComboBox')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'ComboBox')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveComboBox />
                                        </prop:TrueTemplate>
                                </com:Application.Web.Portlets.BConditional>
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'ListBox')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'ListBox')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveListBox />
                                        </prop:TrueTemplate>
                                </com:Application.Web.Portlets.BConditional>
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'FileSet')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'FileSet')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveFileSet />
                                        </prop:TrueTemplate>
                                </com:Application.Web.Portlets.BConditional>
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'Schedule')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'Schedule')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveSchedule />
                                        </prop:TrueTemplate>
                                </com:Application.Web.Portlets.BConditional>
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'Messages')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'Messages')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveMessages />
                                        </prop:TrueTemplate>
                                </com:Application.Web.Portlets.BConditional>
-                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'Runscript')%>">
+                               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'Runscript')%>">
                                        <prop:TrueTemplate>
                                                <com:Application.Web.Portlets.DirectiveRunscript />
                                        </prop:TrueTemplate>
index 5083f58fc18d7bb4218be4c35270a7dd6d6304c9..9e3efd6cb99df351e318f412d6978e8751be533a 100644 (file)
@@ -70,14 +70,14 @@ class BaculaConfigResources extends ResourceListTemplate {
        public function createResourceListElement($sender, $param) {
                $control = $this->getChildControl($param->Item, self::CHILD_CONTROL);
                if (is_object($control)) {
-                       $control->setHost($param->Item->DataItem['host']);
-                       $control->setComponentType($param->Item->DataItem['component_type']);
-                       $control->setComponentName($param->Item->DataItem['component_name']);
-                       $control->setResourceType($param->Item->DataItem['resource_type']);
-                       $control->setResourceName($param->Item->DataItem['resource_name']);
+                       $control->setHost($param->Item->Data['host']);
+                       $control->setComponentType($param->Item->Data['component_type']);
+                       $control->setComponentName($param->Item->Data['component_name']);
+                       $control->setResourceType($param->Item->Data['resource_type']);
+                       $control->setResourceName($param->Item->Data['resource_name']);
                        $control->setResourceNames($this->resource_names);
                }
-               $param->Item->RemoveResource->setCommandParameter($param->Item->DataItem);
+               $param->Item->RemoveResource->setCommandParameter($param->Item->Data);
        }
 
        public function getDirectives($sender, $param) {
index 6f01e476c8a5341aa74babf5ac0a3a64aa1fb197..b2283c1b516cfd16b730f4f57edd5bef27a683e6 100644 (file)
@@ -16,8 +16,8 @@
                                document.getElementById('<%=$this->RemoveResource->ClientID%>').onclick = function(event) {
                                        var t = (event.target||event.srcElement);
                                        var cmsg = '<%[ Are you sure that you want to remove %s resource "%s"? ]%>';
-                                       cmsg = cmsg.replace('%s', '<%=$this->DataItem['resource_type']%>');
-                                       cmsg = cmsg.replace('%s', '<%=$this->DataItem['resource_name']%>');
+                                       cmsg = cmsg.replace('%s', '<%=$this->Data['resource_type']%>');
+                                       cmsg = cmsg.replace('%s', '<%=$this->Data['resource_name']%>');
                                        if (/^<%=$this->RemoveResource->ClientID%>/.test(t.id) && confirm(cmsg)) {
                                                return true;
                                        }
@@ -33,7 +33,7 @@
                                                        ClientSide.OnLoading="BaculaConfig.loader_start(sender.options.ID);"
                                                        ClientSide.OnComplete="BaculaConfig.set_config_items(sender.options.ID);"
                                                        Attributes.onclick="return BaculaConfig.unset_config_items(this.id);"
-                                                       Text="<strong><%=$this->DataItem['resource_type']%></strong>: <%=$this->DataItem['resource_name']%>"
+                                                       Text="<strong><%=$this->Data['resource_type']%></strong>: <%=$this->Data['resource_name']%>"
                                                        Style="text-decoration: none"
                                                />
                                                        <i class="fa fa-sync w3-spin" style="display: none"><i/>
@@ -61,7 +61,7 @@
                                </table>
                                <div class="config_directives" style="display: none">
                                <com:Application.Web.Portlets.BaculaConfigDirectives
-                                       Resource="<%#$this->DataItem['resource_name']%>"
+                                       Resource="<%#$this->Data['resource_name']%>"
                                        LoadValues="<%=true%>"
                                        ShowRemoveButton="false"
                                />
index 8d3a38a22067b85c504bd4bf885e8db530360cda..4f31b56ae435dd331244077d03f338c55aed7f5f 100644 (file)
@@ -44,9 +44,9 @@ class BaculaHosts extends HostListTemplate {
        public function createHostListElement($sender, $param) {
                $control = $this->getChildControl($param->Item, self::CHILD_CONTROL);
                if (is_object($control)) {
-                       $control->setHost($param->Item->DataItem);
+                       $control->setHost($param->Item->Data);
                }
-               $param->Item->RemoveHost->setCommandParameter($param->Item->DataItem);
+               $param->Item->RemoveHost->setCommandParameter($param->Item->Data);
        }
 
        public function getComponents($sender, $param) {
index aa770da8916904ab49017795c40b7f708d079522..3857baa81f7b31a4cd81a53d77a48f8a2eaec559 100644 (file)
                                                        Attributes.onclick="return BaculaConfig.unset_config_items(this.id);"
                                                        Style="text-decoration: none"
                                                >
-                                                       <strong><%=$this->DataItem%></strong>
+                                                       <strong><%=$this->Data%></strong>
                                                </com:TActiveLinkButton>
                                                        <i class="fa fa-sync w3-spin" style="display: none"><i/>
                                                </td>
-                                               <td style="width: 45%"><%[ IP Address/Hostname: ]%><strong> <%=$this->getParent()->getParent()->config[$this->DataItem]['address']%></strong></td>
-                                               <td style="width: 10%"><%[ Port: ]%><strong> <%=$this->getParent()->getParent()->config[$this->DataItem]['port']%></strong>
+                                               <td style="width: 45%"><%[ IP Address/Hostname: ]%><strong> <%=$this->getParent()->getParent()->config[$this->Data]['address']%></strong></td>
+                                               <td style="width: 10%"><%[ Port: ]%><strong> <%=$this->getParent()->getParent()->config[$this->Data]['port']%></strong>
                                                </td>
                                                <td style="width: 15%"><com:TActiveLinkButton
                                                        ID="RemoveHost"
index da4ec3d60c557a7f17e809a9bf7ecd4f9d7771d6..733aaf41ddafd59587848d6572a66a3d65f30e39 100644 (file)
@@ -244,22 +244,22 @@ class DirectiveFileSet extends DirectiveListTemplate {
                        for ($j = 0; $j < count($this->directive_types); $j++) {
                                $control = $this->getChildControl($item, $this->directive_types[$j]);
                                if (is_object($control)) {
-                                       $control->setHost($item->DataItem['host']);
-                                       $control->setComponentType($item->DataItem['component_type']);
-                                       $control->setComponentName($item->DataItem['component_name']);
-                                       $control->setResourceType($item->DataItem['resource_type']);
-                                       $control->setResourceName($item->DataItem['resource_name']);
-                                       $control->setDirectiveName($item->DataItem['directive_name']);
-                                       $control->setDirectiveValue($item->DataItem['directive_value']);
-                                       $control->setDefaultValue($item->DataItem['default_value']);
-                                       $control->setRequired($item->DataItem['required']);
-                                       $control->setData($item->DataItem['data']);
-                                       $control->setLabel($item->DataItem['label']);
-                                       $control->setInConfig($item->DataItem['in_config']);
-                                       $show_all_directives = ($item->DataItem['in_config'] || !$load_values || $this->SourceTemplateControl->getShowAllDirectives());
+                                       $control->setHost($item->Data['host']);
+                                       $control->setComponentType($item->Data['component_type']);
+                                       $control->setComponentName($item->Data['component_name']);
+                                       $control->setResourceType($item->Data['resource_type']);
+                                       $control->setResourceName($item->Data['resource_name']);
+                                       $control->setDirectiveName($item->Data['directive_name']);
+                                       $control->setDirectiveValue($item->Data['directive_value']);
+                                       $control->setDefaultValue($item->Data['default_value']);
+                                       $control->setRequired($item->Data['required']);
+                                       $control->setData($item->Data['data']);
+                                       $control->setLabel($item->Data['label']);
+                                       $control->setInConfig($item->Data['in_config']);
+                                       $show_all_directives = ($item->Data['in_config'] || !$load_values || $this->SourceTemplateControl->getShowAllDirectives());
                                        $control->setShow($show_all_directives);
-                                       $control->setParentName($item->DataItem['parent_name']);
-                                       $control->setGroupName($item->DataItem['group_name']);
+                                       $control->setParentName($item->Data['parent_name']);
+                                       $control->setGroupName($item->Data['group_name']);
                                }
                        }
                }
@@ -269,18 +269,18 @@ class DirectiveFileSet extends DirectiveListTemplate {
                for ($i = 0; $i < count($this->directive_inc_exc_types); $i++) {
                        $control = $this->getChildControl($param->Item, $this->directive_inc_exc_types[$i]);
                        if (is_object($control)) {
-                               $control->setHost($param->Item->DataItem['host']);
-                               $control->setComponentType($param->Item->DataItem['component_type']);
-                               $control->setComponentName($param->Item->DataItem['component_name']);
-                               $control->setResourceType($param->Item->DataItem['resource_type']);
-                               $control->setResourceName($param->Item->DataItem['resource_name']);
-                               $control->setDirectiveName($param->Item->DataItem['directive_name']);
-                               $control->setDirectiveValue($param->Item->DataItem['directive_value']);
-                               $control->setLabel($param->Item->DataItem['directive_name']);
-                               $control->setData($param->Item->DataItem['directive_value']);
+                               $control->setHost($param->Item->Data['host']);
+                               $control->setComponentType($param->Item->Data['component_type']);
+                               $control->setComponentName($param->Item->Data['component_name']);
+                               $control->setResourceType($param->Item->Data['resource_type']);
+                               $control->setResourceName($param->Item->Data['resource_name']);
+                               $control->setDirectiveName($param->Item->Data['directive_name']);
+                               $control->setDirectiveValue($param->Item->Data['directive_value']);
+                               $control->setLabel($param->Item->Data['directive_name']);
+                               $control->setData($param->Item->Data['directive_value']);
                                $control->setInConfig(true);
                                $control->setShow(true);
-                               $control->setParentName($param->Item->DataItem['parent_name']);
+                               $control->setParentName($param->Item->Data['parent_name']);
                        }
                }
        }
index a1b2126546c290f9bcc50f7f153fa3062fb00681..eb4ac1e92e0808118dfd53bd924791cf6e0aa645 100644 (file)
@@ -9,27 +9,27 @@
        </prop:HeaderTemplate>
        <prop:ItemTemplate>
                <%=($this->getItemIndex() % 31 === 0 ? '<h3 class="options">Options #' . (($this->getItemIndex()/31)+1) . '</h3><hr />' : '')%>
-               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'ComboBox')%>">
+               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'ComboBox')%>">
                        <prop:TrueTemplate>
                                <com:Application.Web.Portlets.DirectiveComboBox />
                        </prop:TrueTemplate>
                </com:Application.Web.Portlets.BConditional>
-               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'TextBox')%>">
+               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'TextBox')%>">
                        <prop:TrueTemplate>
                                <com:Application.Web.Portlets.DirectiveText />
                        </prop:TrueTemplate>
                </com:Application.Web.Portlets.BConditional>
-               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'CheckBox')%>">
+               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'CheckBox')%>">
                        <prop:TrueTemplate>
                                <com:Application.Web.Portlets.DirectiveBoolean />
                        </prop:TrueTemplate>
                </com:Application.Web.Portlets.BConditional>
-               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'Integer')%>">
+               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'Integer')%>">
                        <prop:TrueTemplate>
                                <com:Application.Web.Portlets.DirectiveInteger />
                        </prop:TrueTemplate>
                </com:Application.Web.Portlets.BConditional>
-               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'ListBox')%>">
+               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'ListBox')%>">
                        <prop:TrueTemplate>
                                <com:Application.Web.Portlets.DirectiveListBox />
                        </prop:TrueTemplate>
index bc78f8e315560f455b3bb06925556d2a82b52b7a..4943ece4cfb24a0a1e1d0619289216ddceb5c49b 100644 (file)
@@ -178,24 +178,24 @@ class DirectiveMessages extends DirectiveListTemplate {
                for ($i = 0; $i < count($this->directive_types); $i++) {
                        $control = $this->getChildControl($param->Item, $this->directive_types[$i]);
                        if (is_object($control)) {
-                               $control->setHost($param->Item->DataItem['host']);
-                               $control->setComponentType($param->Item->DataItem['component_type']);
-                               $control->setComponentName($param->Item->DataItem['component_name']);
-                               $control->setResourceType($param->Item->DataItem['resource_type']);
-                               $control->setResourceName($param->Item->DataItem['resource_name']);
-                               $control->setDirectiveName($param->Item->DataItem['directive_name']);
-                               $control->setDirectiveValue($param->Item->DataItem['directive_value']);
-                               $control->setDefaultValue($param->Item->DataItem['default_value']);
-                               $control->setRequired($param->Item->DataItem['required']);
-                               $control->setLabel($param->Item->DataItem['label']);
-                               $control->setInConfig($param->Item->DataItem['in_config']);
-                               $control->setShow($param->Item->DataItem['is_address_type']);
-                               $control->setParentName($param->Item->DataItem['parent_name']);
+                               $control->setHost($param->Item->Data['host']);
+                               $control->setComponentType($param->Item->Data['component_type']);
+                               $control->setComponentName($param->Item->Data['component_name']);
+                               $control->setResourceType($param->Item->Data['resource_type']);
+                               $control->setResourceName($param->Item->Data['resource_name']);
+                               $control->setDirectiveName($param->Item->Data['directive_name']);
+                               $control->setDirectiveValue($param->Item->Data['directive_value']);
+                               $control->setDefaultValue($param->Item->Data['default_value']);
+                               $control->setRequired($param->Item->Data['required']);
+                               $control->setLabel($param->Item->Data['label']);
+                               $control->setInConfig($param->Item->Data['in_config']);
+                               $control->setShow($param->Item->Data['is_address_type']);
+                               $control->setParentName($param->Item->Data['parent_name']);
                                break;
                        }
                }
-               $param->Item->Types->setData($param->Item->DataItem['messages_types']);
-               $param->Item->Types->setDirectiveName($param->Item->DataItem['directive_name']);
+               $param->Item->Types->setData($param->Item->Data['messages_types']);
+               $param->Item->Types->setDirectiveName($param->Item->Data['directive_name']);
        }
 
        public function loadMessageTypes($sender, $param) {
index bfcae6e09e3f650f3e7344004d17c378762631b0..567add3b95e8ce77b69e4d407964615fbe8a8d60 100644 (file)
@@ -4,7 +4,7 @@
 <com:TActiveRepeater ID="RepeaterMessages" OnItemCreated="createDirectiveListElement" OnItemDataBound="loadMessageTypes">
        <prop:ItemTemplate>
                <div class="w3-card w3-white w3-padding directive">
-                       <h2><%=$this->DataItem['directive_name']%></h2>
+                       <h2><%=$this->Data['directive_name']%></h2>
                        <com:Application.Web.Portlets.DirectiveText />
                        <com:Application.Web.Portlets.MessageTypes ID="Types" />
                </div>
index 2e6b227f835d578d8f25af7ca7efb3d6e449ca97..a7d1940251c2f245170fca155ee33593762c7015 100644 (file)
@@ -113,22 +113,22 @@ class DirectiveRunscript extends DirectiveListTemplate {
                        for ($j = 0; $j < count($this->directive_types); $j++) {
                                $control = $this->getChildControl($item, $this->directive_types[$j]);
                                if (is_object($control)) {
-                                       $control->setHost($item->DataItem['host']);
-                                       $control->setComponentType($item->DataItem['component_type']);
-                                       $control->setComponentName($item->DataItem['component_name']);
-                                       $control->setResourceType($item->DataItem['resource_type']);
-                                       $control->setResourceName($item->DataItem['resource_name']);
-                                       $control->setDirectiveName($item->DataItem['directive_name']);
-                                       $control->setDirectiveValue($item->DataItem['directive_value']);
-                                       $control->setDefaultValue($item->DataItem['default_value']);
-                                       $control->setRequired($item->DataItem['required']);
-                                       $control->setData($item->DataItem['data']);
-                                       $control->setLabel($item->DataItem['label']);
-                                       $control->setInConfig($item->DataItem['in_config']);
-                                       $show_all_directives = ($item->DataItem['in_config'] || !$load_values || $this->SourceTemplateControl->getShowAllDirectives());
+                                       $control->setHost($item->Data['host']);
+                                       $control->setComponentType($item->Data['component_type']);
+                                       $control->setComponentName($item->Data['component_name']);
+                                       $control->setResourceType($item->Data['resource_type']);
+                                       $control->setResourceName($item->Data['resource_name']);
+                                       $control->setDirectiveName($item->Data['directive_name']);
+                                       $control->setDirectiveValue($item->Data['directive_value']);
+                                       $control->setDefaultValue($item->Data['default_value']);
+                                       $control->setRequired($item->Data['required']);
+                                       $control->setData($item->Data['data']);
+                                       $control->setLabel($item->Data['label']);
+                                       $control->setInConfig($item->Data['in_config']);
+                                       $show_all_directives = ($item->Data['in_config'] || !$load_values || $this->SourceTemplateControl->getShowAllDirectives());
                                        $control->setShow($show_all_directives);
-                                       $control->setParentName($item->DataItem['parent_name']);
-                                       $control->setGroupName($item->DataItem['group_name']);
+                                       $control->setParentName($item->Data['parent_name']);
+                                       $control->setGroupName($item->Data['group_name']);
                                        break;
                                }
                        }
index c798e8d30abc00e3ab9b0ceeeda1bb45f4ad6552..1ca92ae28e9363d8697ec9aa2c0c2ba4459b23fa 100644 (file)
@@ -8,17 +8,17 @@
        </prop:HeaderTemplate>
        <prop:ItemTemplate>
                <%=($this->getItemIndex() % 7 === 0 ? '<h3 class="runscript">Runscript #' . (($this->getItemIndex()/7)+1) . '</h3><hr />' : '')%>
-               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'ComboBox')%>">
+               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'ComboBox')%>">
                        <prop:TrueTemplate>
                                <com:Application.Web.Portlets.DirectiveComboBox />
                        </prop:TrueTemplate>
                </com:Application.Web.Portlets.BConditional>
-               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'TextBox')%>">
+               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'TextBox')%>">
                        <prop:TrueTemplate>
                                <com:Application.Web.Portlets.DirectiveText />
                        </prop:TrueTemplate>
                </com:Application.Web.Portlets.BConditional>
-               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->DataItem['field_type'] === 'CheckBox')%>">
+               <com:Application.Web.Portlets.BConditional BCondition="<%#($this->Data['field_type'] === 'CheckBox')%>">
                        <prop:TrueTemplate>
                                <com:Application.Web.Portlets.DirectiveBoolean />
                        </prop:TrueTemplate>
index 679fafbba2e064d29d8da910106874fdaa5f1828..ebd63d2faeae70004fc1d8360e5a763541258387 100644 (file)
@@ -54,20 +54,20 @@ class MessageTypes extends DirectiveListTemplate {
        public function createTypeListElement($sender, $param) {
                $control = $this->getChildControl($param->Item, 'DirectiveBoolean');
                if (is_object($control)) {
-                       $control->setHost($param->Item->DataItem['host']);
-                       $control->setComponentType($param->Item->DataItem['component_type']);
-                       $control->setComponentName($param->Item->DataItem['component_name']);
-                       $control->setResourceType($param->Item->DataItem['resource_type']);
-                       $control->setResourceName($param->Item->DataItem['resource_name']);
-                       $control->setDirectiveName($param->Item->DataItem['directive_name']);
-                       $control->setDirectiveValue($param->Item->DataItem['directive_value']);
-                       $control->setDefaultValue($param->Item->DataItem['default_value']);
-                       $control->setRequired($param->Item->DataItem['required']);
-                       $control->setLabel($param->Item->DataItem['label']);
-                       $control->setData($param->Item->DataItem['directive_value']);
-                       $control->setInConfig($param->Item->DataItem['in_config']);
-                       $control->setShow($param->Item->DataItem['show']);
-                       $control->setParentName($param->Item->DataItem['parent_name']);
+                       $control->setHost($param->Item->Data['host']);
+                       $control->setComponentType($param->Item->Data['component_type']);
+                       $control->setComponentName($param->Item->Data['component_name']);
+                       $control->setResourceType($param->Item->Data['resource_type']);
+                       $control->setResourceName($param->Item->Data['resource_name']);
+                       $control->setDirectiveName($param->Item->Data['directive_name']);
+                       $control->setDirectiveValue($param->Item->Data['directive_value']);
+                       $control->setDefaultValue($param->Item->Data['default_value']);
+                       $control->setRequired($param->Item->Data['required']);
+                       $control->setLabel($param->Item->Data['label']);
+                       $control->setData($param->Item->Data['directive_value']);
+                       $control->setInConfig($param->Item->Data['in_config']);
+                       $control->setShow($param->Item->Data['show']);
+                       $control->setParentName($param->Item->Data['parent_name']);
                }
        }
 }
index 821a460a3e1f404c9fb331dd12ebd35b085c508a..9833b263d62890c8cfc3dee110d909a6fd7f2431 100644 (file)
        </prop:HeaderTemplate>
        <prop:ItemTemplate>
                <tr class="slide-window-element">
-                       <td><%=$this->DataItem['user']%></td>
-                       <td><%=$this->DataItem['admin'] ? Prado::localize('Administrator') :  Prado::localize('Normal user')%></td>
+                       <td><%=$this->Data['user']%></td>
+                       <td><%=$this->Data['admin'] ? Prado::localize('Administrator') :  Prado::localize('Normal user')%></td>
                        <td>
-                               <com:TPanel Visible="<%=$this->DataItem['admin']%>" Style="line-height: 29px">
+                               <com:TPanel Visible="<%=$this->Data['admin']%>" Style="line-height: 29px">
                                        Main
                                </com:TPanel>
-                               <com:TPanel Visible="<%=!$this->DataItem['admin']%>">
-                                               <select rel="user_host" onchange="Users.set_host('<%=$this->DataItem['user']%>', this);">
+                               <com:TPanel Visible="<%=!$this->Data['admin']%>">
+                                               <select rel="user_host" onchange="Users.set_host('<%=$this->Data['user']%>', this);">
                                                        <com:TRepeater OnInit="SourceTemplateControl.initHosts">
                                                                <prop:HeaderTemplate>
                                                        <option value=""><%[ Select host ]%></option>
                                                                </prop:HeaderTemplate>
                                                                <prop:ItemTemplate>
-                                                       <option value="<%=$this->DataItem%>" <%=(array_key_exists('users', $this->SourceTemplateControl->web_config) && array_key_exists($this->Parent->Parent->Parent->DataItem['user'], $this->SourceTemplateControl->web_config['users']) && $this->SourceTemplateControl->web_config['users'][$this->Parent->Parent->Parent->DataItem['user']] === $this->DataItem) ? 'selected' : ''%>><%=$this->DataItem%></option>
+                                                       <option value="<%=$this->Data%>" <%=(array_key_exists('users', $this->SourceTemplateControl->web_config) && array_key_exists($this->Parent->Parent->Parent->Data['user'], $this->SourceTemplateControl->web_config['users']) && $this->SourceTemplateControl->web_config['users'][$this->Parent->Parent->Parent->Data['user']] === $this->Data) ? 'selected' : ''%>><%=$this->Data%></option>
                                                                </prop:ItemTemplate>
                                                        </com:TRepeater>
                                                </select>
                                </com:TPanel>
                        </td>
                        <td>
-                               <a href="javascript:void(0)" <%=$this->DataItem['admin'] ? 'style="visibility: hidden"' : ''%> onclick="Users.rmUser('<%=$this->DataItem['user']%>')"><img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/user-del.png"> <%[ Remove user ]%></a>
+                               <a href="javascript:void(0)" <%=$this->Data['admin'] ? 'style="visibility: hidden"' : ''%> onclick="Users.rmUser('<%=$this->Data['user']%>')"><img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/user-del.png"> <%[ Remove user ]%></a>
                                <a href="javascript:void(0)" onclick="Users.showChangePwd(this)" rel="chpwd_btn">
                                        <img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/key.png" alt="" />
                                        <%[ Change password ]%>
                                </a>
                                <span style="display: none;" rel="chpwd">
-                                       <input type="password" onkeydown="event.keyCode == 13 ? Users.changePwd(this, '<%=$this->DataItem['user']%>') : (event.keyCode == 27 ? Users.cancelChangePwd(this.nextElementSibling.nextElementSibling) : '');" />
-                                       <a href="javascript:void(0)" onclick="Users.changePwd(this.prevousElementSibling, '<%=$this->DataItem['user']%>')">
+                                       <input type="password" onkeydown="event.keyCode == 13 ? Users.changePwd(this, '<%=$this->Data['user']%>') : (event.keyCode == 27 ? Users.cancelChangePwd(this.nextElementSibling.nextElementSibling) : '');" />
+                                       <a href="javascript:void(0)" onclick="Users.changePwd(this.prevousElementSibling, '<%=$this->Data['user']%>')">
                                                <img src="<%=$this->getPage()->getTheme()->getBaseUrl()%>/icon_ok.png" alt="<%[ Save ]%>" title="<%[ Save ]%>"/>
                                        </a>
                                        <a href="javascript:void(0)" onclick="Users.cancelChangePwd(this)">
index b258eec537c2e614773248ebbfe06b06cddb1718..4cbdc09f6230dbc5c41d5e9eed5d0f33b477b4ba 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<application id="baculum" mode="Normal">
+<application id="baculum" mode="Debug">
        <paths>
                <using namespace="System.I18N.*" />
                <using namespace="Application.Common.Portlets.BButton" />
index 4a3fc5015c5b5c45239ba18f5bf6c582e9a625d2..7a7f20cc6c82b90b2a24691aed90aeecd17ad181 100644 (file)
@@ -58,7 +58,7 @@ tr.file-browser-element:hover {
 }
 
 .file-browser-watermark {
-       padding: 77px 10px;
+       padding: 68px 10px;
        text-align: center;
        font-size: 21px;
        color: rgb(185, 184, 184);
@@ -69,10 +69,6 @@ tr.file-browser-element:hover {
        overflow-y: auto;
 }
 
-.draggable {
-       position: relative !important;
-}
-
 .bold {
        font-weight: bold;
 }