From f2f9d290166e6c2386819b5f6d54fcc7065727fd Mon Sep 17 00:00:00 2001
From: Andrey Kutejko <andy128k@gmail.com>
Date: Sun, 14 Dec 2014 14:43:53 +0200
Subject: [PATCH] admin fields and widgets

---
 ipf/admin/form/fields/html.php                             | 7 +++++++
 ipf/{form/field => admin/form/fields}/orderedset.php       | 4 ++--
 ipf/admin/{formlayout.php => form/layout.php}              | 0
 ipf/{form/widget => admin/form/widgets}/htmlinput.php      | 2 +-
 .../widget => admin/form/widgets}/orderedsettable.php      | 2 +-
 ipf/form/field/html.php                                    | 7 -------
 ipf/form/field/varchar.php                                 | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)
 create mode 100644 ipf/admin/form/fields/html.php
 rename ipf/{form/field => admin/form/fields}/orderedset.php (77%)
 rename ipf/admin/{formlayout.php => form/layout.php} (100%)
 rename ipf/{form/widget => admin/form/widgets}/htmlinput.php (98%)
 rename ipf/{form/widget => admin/form/widgets}/orderedsettable.php (96%)
 delete mode 100644 ipf/form/field/html.php

diff --git a/ipf/admin/form/fields/html.php b/ipf/admin/form/fields/html.php
new file mode 100644
index 0000000..52a5f01
--- /dev/null
+++ b/ipf/admin/form/fields/html.php
@@ -0,0 +1,7 @@
+<?php
+
+class IPF_Admin_Form_Field_Html extends IPF_Form_Field_Varchar
+{
+    public $widget = 'IPF_Admin_Form_Widget_HTMLInput';
+}
+
diff --git a/ipf/form/field/orderedset.php b/ipf/admin/form/fields/orderedset.php
similarity index 77%
rename from ipf/form/field/orderedset.php
rename to ipf/admin/form/fields/orderedset.php
index 773e372..c46acb3 100644
--- a/ipf/form/field/orderedset.php
+++ b/ipf/admin/form/fields/orderedset.php
@@ -1,8 +1,8 @@
 <?php
 
-class IPF_Form_Field_OrderedSet extends IPF_Form_Field_Set
+class IPF_Admin_Form_Field_OrderedSet extends IPF_Form_Field_Set
 {
-    public $widget = 'IPF_Form_Widget_OrderedSetTable';
+    public $widget = 'IPF_Admin_Form_Widget_OrderedSetTable';
     public $orderBy;
 
     public function clean($value)
diff --git a/ipf/admin/formlayout.php b/ipf/admin/form/layout.php
similarity index 100%
rename from ipf/admin/formlayout.php
rename to ipf/admin/form/layout.php
diff --git a/ipf/form/widget/htmlinput.php b/ipf/admin/form/widgets/htmlinput.php
similarity index 98%
rename from ipf/form/widget/htmlinput.php
rename to ipf/admin/form/widgets/htmlinput.php
index e872198..30d17b8 100644
--- a/ipf/form/widget/htmlinput.php
+++ b/ipf/admin/form/widgets/htmlinput.php
@@ -2,7 +2,7 @@
 
 use \PFF\HtmlBuilder\Tag as Tag;
 
-class IPF_Form_Widget_HTMLInput extends IPF_Form_Widget
+class IPF_Admin_Form_Widget_HTMLInput extends IPF_Form_Widget
 {
     public $tinymce_url;
     public $force_absolute_urls;
diff --git a/ipf/form/widget/orderedsettable.php b/ipf/admin/form/widgets/orderedsettable.php
similarity index 96%
rename from ipf/form/widget/orderedsettable.php
rename to ipf/admin/form/widgets/orderedsettable.php
index 60ca43c..1bbd432 100644
--- a/ipf/form/widget/orderedsettable.php
+++ b/ipf/admin/form/widgets/orderedsettable.php
@@ -2,7 +2,7 @@
 
 use \PFF\HtmlBuilder\Tag as Tag;
 
-class IPF_Form_Widget_OrderedSetTable extends IPF_Form_Widget_SetTable
+class IPF_Admin_Form_Widget_OrderedSetTable extends IPF_Form_Widget_SetTable
 {
     public $orderBy;
 
diff --git a/ipf/form/field/html.php b/ipf/form/field/html.php
deleted file mode 100644
index 6c44320..0000000
--- a/ipf/form/field/html.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-class IPF_Form_Field_Html extends IPF_Form_Field_Varchar
-{
-    public $widget = 'IPF_Form_Widget_HTMLInput';
-}
-
diff --git a/ipf/form/field/varchar.php b/ipf/form/field/varchar.php
index 57078d6..4ff45b4 100644
--- a/ipf/form/field/varchar.php
+++ b/ipf/form/field/varchar.php
@@ -24,7 +24,7 @@ class IPF_Form_Field_Varchar extends IPF_Form_Field
 
     protected function createWidget($args)
     {
-        if ($this->max_length > 255 && $this->widget !== 'IPF_Form_Widget_HTMLInput') {
+        if ($this->max_length > 255 && $this->widget === 'IPF_Form_Widget_TextInput') {
             $widgetClass = 'IPF_Form_Widget_TextareaInput';
         } else {
             $widgetClass = $this->widget;
-- 
2.49.0