baculum: Add to directive controls option to hide reset button and remove button

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveCheckBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveCheckBox.tpl
index dd124839b47582fadccff5427ef18f56c13912c2..a599283d948f4430c702f5161a2f1e65320ac59e 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveCheckBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveCheckBox.tpl
@@ -9,6 +9,6 @@
                        OnCheckedChanged="saveValue"
                        ActiveControl.EnableUpdate="false"
                />
-               <i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').checked = <%=$this->getDefaultValue() ? 'true' : 'false'%>;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+               <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').checked = <%=$this->getDefaultValue() ? 'true' : 'false'%>;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
        </div>
 </div>

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
index c6258743a784e07a69205f7f57911719f0d1eca6..f6192d18529f6cee0089157614123b99180fdf49 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveComboBox.tpl
@@ -8,8 +8,8 @@
                        AutoPostBack="false"
                        ActiveControl.EnableUpdate="false"
                /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-               <i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-               <i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+               <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+               <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TRequiredFieldValidator
                        ID="DirectiveValidator"
                        ValidationGroup="<%=$this->getValidationGroup()%>"

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl b/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
index d81d0bb277456b9ae88b6a7953012e544be884b0..050e7a94d6699073d77a7a77255fa137eb64eea1 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveInteger.tpl
@@ -8,8 +8,8 @@
                        ActiveControl.EnableUpdate="false"
                        AutoTrim="true"
                /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-               <i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-               <i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+               <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+               <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TRequiredFieldValidator
                        ID="DirectiveValidator"
                        ValidationGroup="<%=$this->getValidationGroup()%>"

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
index 7e8307d59ef4ebc8f0d6f156827882f54c08d594..d7325b308b6ebe4175dbd4904b64ba343e8f6e48 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveListBox.tpl
@@ -9,8 +9,8 @@
                        AutoPostBack="false"
                        ActiveControl.EnableUpdate="false"
                /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-               <i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-               <i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+               <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+               <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TRequiredFieldValidator
                        ID="DirectiveValidator"
                        ValidationGroup="<%=$this->getValidationGroup()%>"

diff --git a/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl b/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
index 5841566ea111b8663a94f8bbf81b2b8e0dad4475..c4cc00a6f9ed8d871c3b98343bae4b66e5fbf493 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectivePassword.tpl
@@ -12,8 +12,8 @@
                />
                 <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
                <a href="javascript:void(0)" onclick="var el = document.getElementById('<%=$this->Directive->ClientID%>'); el.type = el.type == 'text' ? 'password' : 'text'"><i class="fa fa-eye"></i></a>
-               <i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-               <i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+               <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+               <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TRequiredFieldValidator
                        ID="DirectiveValidator"
                        ValidationGroup="<%=$this->getValidationGroup()%>"

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl b/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
index 695702a0421543e5544592c8d6307a2708ed68aa..c6055543046ef5273cb768e33cf62dffe4537f19 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSize.tpl
@@ -17,8 +17,8 @@
                        AutoPostBack="false"
                        OnSelectedIndexChanged="saveValue"
                /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-               <i class="fa fa-undo reset_btn" onclick="var fsize = Units.format_size(parseInt('<%=$this->getDefaultValue()%>', 10), 'B'); document.getElementById('<%=$this->Directive->ClientID%>').value = fsize.value; document.getElementById('<%=$this->SizeFormat->ClientID%>').value = fsize.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-               <i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+               <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var fsize = Units.format_size(parseInt('<%=$this->getDefaultValue()%>', 10), 'B'); document.getElementById('<%=$this->Directive->ClientID%>').value = fsize.value; document.getElementById('<%=$this->SizeFormat->ClientID%>').value = fsize.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+               <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TRequiredFieldValidator
                        ID="DirectiveValidator"
                        ValidationGroup="<%=$this->getValidationGroup()%>"

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.php b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.php
index 889bbd315353fe46787833d9db0308d85d29ceaf..c4892abe1893a8c957579fdcc933a0f110379eb0 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.php
@@ -167,28 +167,6 @@ class DirectiveSpeed extends DirectiveTemplate {
                return $value;
        }
 
-       /**
-        * Set allow remove option.
-        * If set, it shows remoe button for control. Default is set.
-        *
-        * @param boolean $allow_remove allow remove state
-        * @return none
-        */
-       public function setAllowRemove($allow_remove) {
-               $allow_remove = TPropertyValue::ensureBoolean($allow_remove);
-               $this->setViewState(self::ALLOW_REMOVE, $allow_remove);
-       }
-
-       /**
-        * Get allow remove state.
-        * If not set, by default option value is true.
-        *
-        * @return boolean allow remove state
-        */
-       public function getAllowRemove() {
-               return $this->getViewState(self::ALLOW_REMOVE, true);
-       }
-
        /**
         * Set unit type to show in control.
         * Allowed values are: decemial or binary.

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
index 2e3adf758c2eeb00b9880f6b60427973e5708696..e1fedddcc6c932d5adabd3b1b2c308f653f5a2c2 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveSpeed.tpl
@@ -17,8 +17,8 @@
                        AutoPostBack="false"
                        OnSelectedIndexChanged="saveValue"
                /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-               <i class="fa fa-undo reset_btn" onclick="var fspeed = Units.format_speed(parseInt('<%=$this->getDefaultValue()%>', 10), 'B/s'); document.getElementById('<%=$this->Directive->ClientID%>').value = fspeed.value; document.getElementById('<%=$this->SpeedFormat->ClientID%>').value = fspeed.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-               <i class="fa fa-trash-alt remove_btn<%=$this->getAllowRemove() ? '' : ' hide'%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+               <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var fspeed = Units.format_speed(parseInt('<%=$this->getDefaultValue()%>', 10), 'B/s'); document.getElementById('<%=$this->Directive->ClientID%>').value = fspeed.value; document.getElementById('<%=$this->SpeedFormat->ClientID%>').value = fspeed.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+               <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TRequiredFieldValidator
                        ID="DirectiveValidator"
                        ValidationGroup="<%=$this->getValidationGroup()%>"

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveTemplate.php b/gui/baculum/protected/Web/Portlets/DirectiveTemplate.php
index 58fb8d0af146d479949a2c5272c049c1fa854433..e124204c8466cba11f600a3032d482f375f4cf00 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveTemplate.php
+++ b/gui/baculum/protected/Web/Portlets/DirectiveTemplate.php
@@ -54,6 +54,8 @@ class DirectiveTemplate extends DirectiveControlTemplate implements IDirectiveFi
        const VALIDATION_GROUP = 'ValidationGroup';
        const CSSCLASS = 'CssClass';
        const DISABLED = 'Disabled';
+       const SHOW_RESET_BUTTON = 'ShowResetButton';
+       const SHOW_REMOVE_BUTTON = 'ShowRemoveButton';
 
        public $display_directive;
 
@@ -287,5 +289,23 @@ class DirectiveTemplate extends DirectiveControlTemplate implements IDirectiveFi
                $disabled = TPropertyValue::ensureBoolean($disabled);
                $this->setViewState(self::DISABLED, $disabled);
        }
+
+       public function getShowResetButton() {
+               return $this->getViewState(self::SHOW_RESET_BUTTON, true);
+       }
+
+       public function setShowResetButton($show) {
+               $show = TPropertyValue::ensureBoolean($show);
+               $this->setViewState(self::SHOW_RESET_BUTTON, $show);
+       }
+
+       public function getShowRemoveButton() {
+               return $this->getViewState(self::SHOW_REMOVE_BUTTON, true);
+       }
+
+       public function setShowRemoveButton($show) {
+               $show = TPropertyValue::ensureBoolean($show);
+               $this->setViewState(self::SHOW_REMOVE_BUTTON, $show);
+       }
 }
 ?>

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl b/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
index a7b87cdb6e1117ae429731a89475ce9a333c3541..802d77554cbd589e34b7362c9ecb3597f075db51 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveTextBox.tpl
@@ -8,8 +8,8 @@
                        ActiveControl.EnableUpdate="false"
                        AutoTrim="true"
                /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-               <i class="fa fa-undo reset_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-               <i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+               <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '<%=$this->getDefaultValue() === 0 ? '' : $this->getDefaultValue()%>';" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+               <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TRequiredFieldValidator
                        ID="DirectiveValidator"
                        ValidationGroup="<%=$this->getValidationGroup()%>"

diff --git a/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl b/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
index 61c3279d734ae7f6f933be498406d045d92f5cc9..6e525cdd140d87935df9f18d90fb31a41ec3009d 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
+++ b/gui/baculum/protected/Web/Portlets/DirectiveTimePeriod.tpl
@@ -17,8 +17,8 @@
                        AutoPostBack="false"
                        OnSelectedIndexChanged="saveValue"
                /> <%=$this->getRequired() ? '&nbsp;<i class="fa fa-asterisk w3-text-red" style="line-height: 40px"></i>' : ''%>
-               <i class="fa fa-undo reset_btn" onclick="var ftime = Units.format_time_period(parseInt('<%=$this->getDefaultValue()%>', 10), 'second'); document.getElementById('<%=$this->Directive->ClientID%>').value = ftime.value; document.getElementById('<%=$this->TimeFormat->ClientID%>').value = ftime.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
-               <i class="fa fa-trash-alt remove_btn" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
+               <i class="fa fa-undo reset_btn<%=!$this->ShowResetButton ? ' hide' : ''%>" onclick="var ftime = Units.format_time_period(parseInt('<%=$this->getDefaultValue()%>', 10), 'second'); document.getElementById('<%=$this->Directive->ClientID%>').value = ftime.value; document.getElementById('<%=$this->TimeFormat->ClientID%>').value = ftime.format;" alt="<%[ Reset to default value ]%>" title="<%[ Reset to default value ]%>"></i>
+               <i class="fa fa-trash-alt remove_btn<%=!$this->ShowRemoveButton ? ' hide' : ''%>" onclick="document.getElementById('<%=$this->Directive->ClientID%>').value = '';" alt="<%[ Remove directive ]%>" title="<%[ Remove directive ]%>"></i>
                <com:TRequiredFieldValidator
                        ID="DirectiveValidator"
                        ValidationGroup="<%=$this->getValidationGroup()%>"