From bd569da4f1d6ada00f5e48eac9716c068003748a Mon Sep 17 00:00:00 2001 From: anuko Date: Tue, 28 Feb 2017 16:09:46 +0000 Subject: [PATCH 1/1] Some renaming. --- WEB-INF/lib/form/Calendar.class.php | 2 +- WEB-INF/lib/form/Checkbox.class.php | 4 ++-- WEB-INF/lib/form/CheckboxGroup.class.php | 2 +- WEB-INF/lib/form/Combobox.class.php | 4 ++-- WEB-INF/lib/form/DateField.class.php | 4 ++-- WEB-INF/lib/form/FormElement.class.php | 6 +++--- WEB-INF/lib/form/TextArea.class.php | 4 ++-- WEB-INF/lib/form/TextField.class.php | 4 ++-- WEB-INF/templates/footer.tpl | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/WEB-INF/lib/form/Calendar.class.php b/WEB-INF/lib/form/Calendar.class.php index a64a0359..e9d50976 100644 --- a/WEB-INF/lib/form/Calendar.class.php +++ b/WEB-INF/lib/form/Calendar.class.php @@ -73,7 +73,7 @@ class Calendar extends FormElement { $this->weekStartDay = $user->week_start; } - function setStyle($style) { $this->mStyle = $style; } + function setStyle($style) { $this->style = $style; } function setCellStyle($style) { $this->mCellStyle = $style; } function setACellStyle($style) { $this->mACellStyle = $style; } function setLinkStyle($style) { $this->mLinkStyle = $style; } diff --git a/WEB-INF/lib/form/Checkbox.class.php b/WEB-INF/lib/form/Checkbox.class.php index d79e5fe7..7a49a6fb 100644 --- a/WEB-INF/lib/form/Checkbox.class.php +++ b/WEB-INF/lib/form/Checkbox.class.php @@ -56,8 +56,8 @@ class Checkbox extends FormElement { if ($this->on_change!="") $html .= " onchange=\"$this->on_change\""; - if ($this->mStyle!="") - $html .= " style=\"$this->mStyle\""; + if ($this->style!="") + $html .= " style=\"$this->style\""; if ($this->mChecked || (($this->value == $this->mOptions) && ($this->value != null))) $html .= " checked=\"true\""; diff --git a/WEB-INF/lib/form/CheckboxGroup.class.php b/WEB-INF/lib/form/CheckboxGroup.class.php index 13f207d9..21a9e35c 100644 --- a/WEB-INF/lib/form/CheckboxGroup.class.php +++ b/WEB-INF/lib/form/CheckboxGroup.class.php @@ -132,7 +132,7 @@ class CheckboxGroup extends FormElement { } - $html = "\n\tmStyle."\">
\n"; + $html = "\n\tstyle."\">\n"; $html .= "
\n"; $html .= ''.$this->lSelAll.' / '.$this->lSelNone.''; $html .= "
"; diff --git a/WEB-INF/lib/form/Combobox.class.php b/WEB-INF/lib/form/Combobox.class.php index 78bd9962..19081948 100644 --- a/WEB-INF/lib/form/Combobox.class.php +++ b/WEB-INF/lib/form/Combobox.class.php @@ -82,8 +82,8 @@ class Combobox extends FormElement { if ($this->on_change!="") $html .= " onchange=\"$this->on_change\""; - if ($this->mStyle!="") - $html .= " style=\"$this->mStyle\""; + if ($this->style!="") + $html .= " style=\"$this->style\""; if (!$this->isEnable()) $html .= " disabled"; diff --git a/WEB-INF/lib/form/DateField.class.php b/WEB-INF/lib/form/DateField.class.php index 87f9ee82..b85632d5 100644 --- a/WEB-INF/lib/form/DateField.class.php +++ b/WEB-INF/lib/form/DateField.class.php @@ -398,8 +398,8 @@ class DateField extends TextField { if ($this->size!="") $html .= " size=\"$this->size\""; - if ($this->mStyle!="") - $html .= " style=\"$this->mStyle\""; + if ($this->style!="") + $html .= " style=\"$this->style\""; $html .= " maxlength=\"50\""; diff --git a/WEB-INF/lib/form/FormElement.class.php b/WEB-INF/lib/form/FormElement.class.php index 7e20739c..384dbebd 100644 --- a/WEB-INF/lib/form/FormElement.class.php +++ b/WEB-INF/lib/form/FormElement.class.php @@ -37,9 +37,9 @@ class FormElement { var $on_change = ''; // What happens when value of control changes. var $on_click = ''; // What happens when the control is clicked. var $label = ''; // Optional label for control. + var $style = ''; // Control style. // TODO: refactoring ongoing down from here. - var $mStyle = ""; var $mRenderable = true; var $mEnabled = true; var $cClassName = "FormElement"; @@ -74,8 +74,8 @@ class FormElement { function setMaxLength($value) { $this->max_length = $value; } function getMaxLength() { return $this->max_length; } - function setStyle($value) { $this->mStyle = $value; } - function getStyle() { return $this->mStyle; } + function setStyle($value) { $this->style = $value; } + function getStyle() { return $this->style; } function setRenderable($flag) { $this->mRenderable = $flag; } function isRenderable() { return $this->mRenderable; } diff --git a/WEB-INF/lib/form/TextArea.class.php b/WEB-INF/lib/form/TextArea.class.php index 8a4e20a5..784803b2 100644 --- a/WEB-INF/lib/form/TextArea.class.php +++ b/WEB-INF/lib/form/TextArea.class.php @@ -70,8 +70,8 @@ class TextArea extends FormElement { $html .= " maxlength=\"$this->max_length\""; } - if ($this->mStyle!="") - $html .= " style=\"$this->mStyle\""; + if ($this->style!="") + $html .= " style=\"$this->style\""; if ($this->mOnKeyPress) { $html .= " onkeypress=\"$this->mOnKeyPress\""; diff --git a/WEB-INF/lib/form/TextField.class.php b/WEB-INF/lib/form/TextField.class.php index 82d6af20..e4d58659 100644 --- a/WEB-INF/lib/form/TextField.class.php +++ b/WEB-INF/lib/form/TextField.class.php @@ -57,8 +57,8 @@ class TextField extends FormElement { if ($this->size!="") $html .= " size=\"$this->size\""; - if ($this->mStyle!="") - $html .= " style=\"$this->mStyle\""; + if ($this->style!="") + $html .= " style=\"$this->style\""; if ($this->max_length!="") $html .= " maxlength=\"$this->max_length\""; diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl index 8e76d6ed..22ef8901 100644 --- a/WEB-INF/templates/footer.tpl +++ b/WEB-INF/templates/footer.tpl @@ -12,7 +12,7 @@
-
 Anuko Time Tracker 1.10.38.3603 | Copyright © Anuko | +  Anuko Time Tracker 1.10.38.3604 | Copyright © Anuko | {$i18n.footer.credits} | {$i18n.footer.license} | {$i18n.footer.improve} -- 2.20.1