active input addon

trntv · Sep 18, 2015 · d9caf5e · d9caf5e
1 parent de97e0b
commit d9caf5e
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Once the extension is installed, simply use it in your code by  :
 
 ``phpMomentMapping`` - formats map (Default: ``true``)
 
-``containerOptions`` - widget container options
+``containerOptions`` - widget container optionsgit
 
 ``clientOptions`` - [full list of available options](http://eonasdan.github.io/bootstrap-datetimepicker/Options/)
 

diff --git a/src/DateTimeWidget.php b/src/DateTimeWidget.php
@@ -24,6 +24,10 @@ class DateTimeWidget extends InputWidget
      * @var array
      */
     public $containerOptions = [];
+    /**
+     * @var array
+     */
+    public $inputAddonOptions = [];
     /**
      * @var string
      */
@@ -92,7 +96,10 @@ public function init()
         }
         DateTimeAsset::register($this->getView());
         $clientOptions = Json::encode($this->clientOptions);
-        $this->view->registerJs("$('#{$this->options['id']}').datetimepicker({$clientOptions})");
+        if (!isset($this->containerOptions['id'])) {
+            $this->containerOptions['id'] = $this->getId();
+        }
+        $this->view->registerJs("$('#{$this->containerOptions['id']}').datetimepicker({$clientOptions})");
     }
 
     /**
@@ -106,24 +113,49 @@ public function run()
         }
         Html::addCssStyle($this->containerOptions, 'position: relative');
         $content[] = Html::beginTag('div', $this->containerOptions);
+        $content[] = $this->renderInput();
+
+        if ($this->showInputAddon) {
+            $content[] = $this->renderInputAddon();
+        }
 
+        $content[] = Html::endTag('div');
+        return implode("\n", $content);
+    }
+
+    /**
+     * @return string
+     */
+    protected function renderInput()
+    {
         if ($this->hasModel()) {
-            $content[] = Html::activeTextInput($this->model, $this->attribute, $this->options);
+            $content = Html::activeTextInput($this->model, $this->attribute, $this->options);
         } else {
-            $content[] = Html::textInput($this->name, $this->value, $this->options);
+            $content = Html::textInput($this->name, $this->value, $this->options);
         }
+        return $content;
+    }
 
-        if ($this->showInputAddon) {
-            $content[] = Html::beginTag('span', ['class' => 'input-group-addon']);
-            if ($this->inputAddonContent) {
-                $content[] = $this->inputAddonContent;
-            } else {
-                $content[] = Html::tag('span', '', ['class' => 'glyphicon glyphicon-calendar']);
-            }
-            $content[] = Html::endTag('span');
+    /**
+     * @return string
+     */
+    protected function renderInputAddon()
+    {
+        $content = [];
+        if (!array_key_exists('class', $this->inputAddonOptions)) {
+            Html::addCssClass($this->inputAddonOptions, 'input-group-addon');
+        }
+        if (!array_key_exists('style', $this->inputAddonOptions)) {
+            Html::addCssStyle($this->inputAddonOptions, ['cursor' => 'pointer']);
         }
+        $content[] = Html::beginTag('span', $this->inputAddonOptions);
+        if ($this->inputAddonContent) {
+            $content[] = $this->inputAddonContent;
+        } else {
+            $content[] = Html::tag('span', '', ['class' => 'glyphicon glyphicon-calendar']);
+        }
+        $content[] = Html::endTag('span');
 
-        $content[] = Html::endTag('div');
         return implode("\n", $content);
     }