From 34731be27f9850ab557a9d7529b989b037cebdec Mon Sep 17 00:00:00 2001 From: sunhao Date: Fri, 5 May 2023 15:03:14 +0800 Subject: [PATCH] * zin: move zin dir to lib --- framework/base/control.class.php | 3 ++- {zin => lib/zin}/config.php | 0 {zin => lib/zin}/core/context.class.php | 0 {zin => lib/zin}/core/context.func.php | 0 {zin => lib/zin}/core/data.func.php | 0 {zin => lib/zin}/core/directive.class.php | 0 {zin => lib/zin}/core/dom.class.php | 0 {zin => lib/zin}/core/h.class.php | 0 {zin => lib/zin}/core/h.func.php | 0 {zin => lib/zin}/core/item.class.php | 0 {zin => lib/zin}/core/on.class.php | 0 {zin => lib/zin}/core/portal.class.php | 0 {zin => lib/zin}/core/props.class.php | 0 {zin => lib/zin}/core/render.func.php | 0 {zin => lib/zin}/core/selector.func.php | 0 {zin => lib/zin}/core/set.class.php | 0 {zin => lib/zin}/core/to.class.php | 0 {zin => lib/zin}/core/wg.class.php | 0 {zin => lib/zin}/core/wg.func.php | 0 {zin => lib/zin}/core/zin.class.php | 0 {zin => lib/zin}/func.php | 0 {zin => lib/zin}/helper.php | 2 +- {zin => lib/zin}/utils/classlist.class.php | 0 {zin => lib/zin}/utils/data.class.php | 0 {zin => lib/zin}/utils/dataset.class.php | 0 {zin => lib/zin}/utils/debug.func.php | 0 {zin => lib/zin}/utils/deep.func.php | 0 {zin => lib/zin}/utils/flat.func.php | 0 {zin => lib/zin}/utils/hx.class.php | 0 {zin => lib/zin}/utils/style.class.php | 0 {zin => lib/zin}/wg/actionitem/v1.php | 0 {zin => lib/zin}/wg/avatar/v1.php | 0 {zin => lib/zin}/wg/btn/v1.php | 0 {zin => lib/zin}/wg/btngroup/v1.php | 0 {zin => lib/zin}/wg/cell/v1.php | 0 {zin => lib/zin}/wg/center/v1.php | 0 {zin => lib/zin}/wg/checkbox/v1.php | 0 {zin => lib/zin}/wg/checklist/v1.php | 0 {zin => lib/zin}/wg/col/v1.php | 0 {zin => lib/zin}/wg/colorpicker/v1.php | 0 {zin => lib/zin}/wg/control/v1.php | 0 {zin => lib/zin}/wg/datepicker/v1.php | 0 {zin => lib/zin}/wg/datetimepicker/v1.php | 0 {zin => lib/zin}/wg/dropdown/v1.php | 0 {zin => lib/zin}/wg/dtable/css/v1.css | 0 {zin => lib/zin}/wg/dtable/v1.php | 0 {zin => lib/zin}/wg/editor/v1.php | 0 {zin => lib/zin}/wg/featurebar/v1.php | 0 {zin => lib/zin}/wg/fileinput/v1.php | 0 {zin => lib/zin}/wg/form/v1.php | 0 {zin => lib/zin}/wg/formgroup/v1.php | 0 {zin => lib/zin}/wg/formlabel/v1.php | 0 {zin => lib/zin}/wg/formpanel/v1.php | 0 {zin => lib/zin}/wg/formrow/v1.php | 0 {zin => lib/zin}/wg/fragment/v1.php | 0 {zin => lib/zin}/wg/header/v1.php | 0 {zin => lib/zin}/wg/heading/v1.php | 0 {zin => lib/zin}/wg/history/css/v1.css | 0 {zin => lib/zin}/wg/history/v1.php | 0 {zin => lib/zin}/wg/icon/v1.php | 0 {zin => lib/zin}/wg/input/v1.php | 0 {zin => lib/zin}/wg/inputcontrol/v1.php | 0 {zin => lib/zin}/wg/inputgroup/v1.php | 0 {zin => lib/zin}/wg/label/v1.php | 0 {zin => lib/zin}/wg/main/v1.php | 0 {zin => lib/zin}/wg/mainmenu/v1.php | 0 {zin => lib/zin}/wg/menu/v1.php | 0 {zin => lib/zin}/wg/modal/v1.php | 0 {zin => lib/zin}/wg/modaldialog/v1.php | 0 {zin => lib/zin}/wg/modaltrigger/v1.php | 0 {zin => lib/zin}/wg/modulemenu/css/v1.css | 0 {zin => lib/zin}/wg/modulemenu/v1.php | 0 {zin => lib/zin}/wg/nav/v1.php | 0 {zin => lib/zin}/wg/navbar/v1.php | 0 {zin => lib/zin}/wg/page/v1.php | 0 {zin => lib/zin}/wg/pagebase/v1.php | 0 {zin => lib/zin}/wg/pageform/v1.php | 0 {zin => lib/zin}/wg/pager/v1.php | 0 {zin => lib/zin}/wg/panel/v1.php | 0 {zin => lib/zin}/wg/picker/v1.php | 0 {zin => lib/zin}/wg/programmenu/css/v1.css | 0 {zin => lib/zin}/wg/programmenu/v1.php | 0 {zin => lib/zin}/wg/radio/v1.php | 0 {zin => lib/zin}/wg/radiolist/v1.php | 0 {zin => lib/zin}/wg/row/v1.php | 0 {zin => lib/zin}/wg/searchform/v1.php | 0 {zin => lib/zin}/wg/searchtoggle/css/v1.css | 0 {zin => lib/zin}/wg/searchtoggle/js/v1.js | 0 {zin => lib/zin}/wg/searchtoggle/v1.php | 0 {zin => lib/zin}/wg/select/v1.php | 0 {zin => lib/zin}/wg/sidebar/css/v1.css | 0 {zin => lib/zin}/wg/sidebar/js/v1.js | 0 {zin => lib/zin}/wg/sidebar/v1.php | 0 {zin => lib/zin}/wg/switcher/v1.php | 0 {zin => lib/zin}/wg/tabs/v1.php | 0 {zin => lib/zin}/wg/textarea/v1.php | 0 {zin => lib/zin}/wg/timepicker/v1.php | 0 {zin => lib/zin}/wg/toolbar/v1.php | 0 {zin => lib/zin}/wg/tooltip/v1.php | 0 {zin => lib/zin}/wg/useravatar/v1.php | 0 {zin => lib/zin}/zentao/pager.func.php | 0 {zin => lib/zin}/zentao/zentao.func.php | 0 zin/zin.php => lib/zin/zin.class.php | 0 {zin => lib/zin}/zui/toggle.class.php | 0 {zin => lib/zin}/zui/toggle.func.php | 0 {zin => lib/zin}/zui/zui.class.php | 0 {zin => lib/zin}/zui/zui.func.php | 0 107 files changed, 3 insertions(+), 2 deletions(-) rename {zin => lib/zin}/config.php (100%) mode change 100755 => 100644 rename {zin => lib/zin}/core/context.class.php (100%) rename {zin => lib/zin}/core/context.func.php (100%) rename {zin => lib/zin}/core/data.func.php (100%) rename {zin => lib/zin}/core/directive.class.php (100%) rename {zin => lib/zin}/core/dom.class.php (100%) rename {zin => lib/zin}/core/h.class.php (100%) rename {zin => lib/zin}/core/h.func.php (100%) rename {zin => lib/zin}/core/item.class.php (100%) rename {zin => lib/zin}/core/on.class.php (100%) rename {zin => lib/zin}/core/portal.class.php (100%) rename {zin => lib/zin}/core/props.class.php (100%) mode change 100755 => 100644 rename {zin => lib/zin}/core/render.func.php (100%) rename {zin => lib/zin}/core/selector.func.php (100%) rename {zin => lib/zin}/core/set.class.php (100%) rename {zin => lib/zin}/core/to.class.php (100%) rename {zin => lib/zin}/core/wg.class.php (100%) rename {zin => lib/zin}/core/wg.func.php (100%) rename {zin => lib/zin}/core/zin.class.php (100%) rename {zin => lib/zin}/func.php (100%) rename {zin => lib/zin}/helper.php (96%) mode change 100755 => 100644 rename {zin => lib/zin}/utils/classlist.class.php (100%) mode change 100755 => 100644 rename {zin => lib/zin}/utils/data.class.php (100%) rename {zin => lib/zin}/utils/dataset.class.php (100%) mode change 100755 => 100644 rename {zin => lib/zin}/utils/debug.func.php (100%) rename {zin => lib/zin}/utils/deep.func.php (100%) rename {zin => lib/zin}/utils/flat.func.php (100%) rename {zin => lib/zin}/utils/hx.class.php (100%) mode change 100755 => 100644 rename {zin => lib/zin}/utils/style.class.php (100%) mode change 100755 => 100644 rename {zin => lib/zin}/wg/actionitem/v1.php (100%) rename {zin => lib/zin}/wg/avatar/v1.php (100%) rename {zin => lib/zin}/wg/btn/v1.php (100%) mode change 100755 => 100644 rename {zin => lib/zin}/wg/btngroup/v1.php (100%) rename {zin => lib/zin}/wg/cell/v1.php (100%) rename {zin => lib/zin}/wg/center/v1.php (100%) rename {zin => lib/zin}/wg/checkbox/v1.php (100%) rename {zin => lib/zin}/wg/checklist/v1.php (100%) rename {zin => lib/zin}/wg/col/v1.php (100%) rename {zin => lib/zin}/wg/colorpicker/v1.php (100%) rename {zin => lib/zin}/wg/control/v1.php (100%) rename {zin => lib/zin}/wg/datepicker/v1.php (100%) rename {zin => lib/zin}/wg/datetimepicker/v1.php (100%) rename {zin => lib/zin}/wg/dropdown/v1.php (100%) rename {zin => lib/zin}/wg/dtable/css/v1.css (100%) rename {zin => lib/zin}/wg/dtable/v1.php (100%) rename {zin => lib/zin}/wg/editor/v1.php (100%) rename {zin => lib/zin}/wg/featurebar/v1.php (100%) rename {zin => lib/zin}/wg/fileinput/v1.php (100%) rename {zin => lib/zin}/wg/form/v1.php (100%) rename {zin => lib/zin}/wg/formgroup/v1.php (100%) rename {zin => lib/zin}/wg/formlabel/v1.php (100%) rename {zin => lib/zin}/wg/formpanel/v1.php (100%) rename {zin => lib/zin}/wg/formrow/v1.php (100%) rename {zin => lib/zin}/wg/fragment/v1.php (100%) rename {zin => lib/zin}/wg/header/v1.php (100%) rename {zin => lib/zin}/wg/heading/v1.php (100%) rename {zin => lib/zin}/wg/history/css/v1.css (100%) rename {zin => lib/zin}/wg/history/v1.php (100%) rename {zin => lib/zin}/wg/icon/v1.php (100%) rename {zin => lib/zin}/wg/input/v1.php (100%) rename {zin => lib/zin}/wg/inputcontrol/v1.php (100%) rename {zin => lib/zin}/wg/inputgroup/v1.php (100%) rename {zin => lib/zin}/wg/label/v1.php (100%) rename {zin => lib/zin}/wg/main/v1.php (100%) rename {zin => lib/zin}/wg/mainmenu/v1.php (100%) rename {zin => lib/zin}/wg/menu/v1.php (100%) rename {zin => lib/zin}/wg/modal/v1.php (100%) rename {zin => lib/zin}/wg/modaldialog/v1.php (100%) rename {zin => lib/zin}/wg/modaltrigger/v1.php (100%) rename {zin => lib/zin}/wg/modulemenu/css/v1.css (100%) rename {zin => lib/zin}/wg/modulemenu/v1.php (100%) rename {zin => lib/zin}/wg/nav/v1.php (100%) mode change 100755 => 100644 rename {zin => lib/zin}/wg/navbar/v1.php (100%) rename {zin => lib/zin}/wg/page/v1.php (100%) rename {zin => lib/zin}/wg/pagebase/v1.php (100%) rename {zin => lib/zin}/wg/pageform/v1.php (100%) rename {zin => lib/zin}/wg/pager/v1.php (100%) rename {zin => lib/zin}/wg/panel/v1.php (100%) rename {zin => lib/zin}/wg/picker/v1.php (100%) rename {zin => lib/zin}/wg/programmenu/css/v1.css (100%) rename {zin => lib/zin}/wg/programmenu/v1.php (100%) rename {zin => lib/zin}/wg/radio/v1.php (100%) rename {zin => lib/zin}/wg/radiolist/v1.php (100%) rename {zin => lib/zin}/wg/row/v1.php (100%) rename {zin => lib/zin}/wg/searchform/v1.php (100%) rename {zin => lib/zin}/wg/searchtoggle/css/v1.css (100%) rename {zin => lib/zin}/wg/searchtoggle/js/v1.js (100%) rename {zin => lib/zin}/wg/searchtoggle/v1.php (100%) rename {zin => lib/zin}/wg/select/v1.php (100%) rename {zin => lib/zin}/wg/sidebar/css/v1.css (100%) rename {zin => lib/zin}/wg/sidebar/js/v1.js (100%) rename {zin => lib/zin}/wg/sidebar/v1.php (100%) rename {zin => lib/zin}/wg/switcher/v1.php (100%) rename {zin => lib/zin}/wg/tabs/v1.php (100%) rename {zin => lib/zin}/wg/textarea/v1.php (100%) rename {zin => lib/zin}/wg/timepicker/v1.php (100%) rename {zin => lib/zin}/wg/toolbar/v1.php (100%) rename {zin => lib/zin}/wg/tooltip/v1.php (100%) rename {zin => lib/zin}/wg/useravatar/v1.php (100%) rename {zin => lib/zin}/zentao/pager.func.php (100%) rename {zin => lib/zin}/zentao/zentao.func.php (100%) rename zin/zin.php => lib/zin/zin.class.php (100%) mode change 100755 => 100644 rename {zin => lib/zin}/zui/toggle.class.php (100%) rename {zin => lib/zin}/zui/toggle.func.php (100%) rename {zin => lib/zin}/zui/zui.class.php (100%) rename {zin => lib/zin}/zui/zui.func.php (100%) diff --git a/framework/base/control.class.php b/framework/base/control.class.php index 115b859e95..a78fa3c233 100644 --- a/framework/base/control.class.php +++ b/framework/base/control.class.php @@ -950,7 +950,8 @@ class baseControl if(empty($moduleName)) $moduleName = $this->moduleName; if(empty($methodName)) $methodName = $this->methodName; - include $this->app->getBasePath() . 'zin' . DS . 'zin.php'; + /* Load zin lib */ + $this->app->loadClass('zin', true); /** * 设置视图文件。(PHP7有一个bug,不能直接$viewFile = $this->setViewFile())。 diff --git a/zin/config.php b/lib/zin/config.php old mode 100755 new mode 100644 similarity index 100% rename from zin/config.php rename to lib/zin/config.php diff --git a/zin/core/context.class.php b/lib/zin/core/context.class.php similarity index 100% rename from zin/core/context.class.php rename to lib/zin/core/context.class.php diff --git a/zin/core/context.func.php b/lib/zin/core/context.func.php similarity index 100% rename from zin/core/context.func.php rename to lib/zin/core/context.func.php diff --git a/zin/core/data.func.php b/lib/zin/core/data.func.php similarity index 100% rename from zin/core/data.func.php rename to lib/zin/core/data.func.php diff --git a/zin/core/directive.class.php b/lib/zin/core/directive.class.php similarity index 100% rename from zin/core/directive.class.php rename to lib/zin/core/directive.class.php diff --git a/zin/core/dom.class.php b/lib/zin/core/dom.class.php similarity index 100% rename from zin/core/dom.class.php rename to lib/zin/core/dom.class.php diff --git a/zin/core/h.class.php b/lib/zin/core/h.class.php similarity index 100% rename from zin/core/h.class.php rename to lib/zin/core/h.class.php diff --git a/zin/core/h.func.php b/lib/zin/core/h.func.php similarity index 100% rename from zin/core/h.func.php rename to lib/zin/core/h.func.php diff --git a/zin/core/item.class.php b/lib/zin/core/item.class.php similarity index 100% rename from zin/core/item.class.php rename to lib/zin/core/item.class.php diff --git a/zin/core/on.class.php b/lib/zin/core/on.class.php similarity index 100% rename from zin/core/on.class.php rename to lib/zin/core/on.class.php diff --git a/zin/core/portal.class.php b/lib/zin/core/portal.class.php similarity index 100% rename from zin/core/portal.class.php rename to lib/zin/core/portal.class.php diff --git a/zin/core/props.class.php b/lib/zin/core/props.class.php old mode 100755 new mode 100644 similarity index 100% rename from zin/core/props.class.php rename to lib/zin/core/props.class.php diff --git a/zin/core/render.func.php b/lib/zin/core/render.func.php similarity index 100% rename from zin/core/render.func.php rename to lib/zin/core/render.func.php diff --git a/zin/core/selector.func.php b/lib/zin/core/selector.func.php similarity index 100% rename from zin/core/selector.func.php rename to lib/zin/core/selector.func.php diff --git a/zin/core/set.class.php b/lib/zin/core/set.class.php similarity index 100% rename from zin/core/set.class.php rename to lib/zin/core/set.class.php diff --git a/zin/core/to.class.php b/lib/zin/core/to.class.php similarity index 100% rename from zin/core/to.class.php rename to lib/zin/core/to.class.php diff --git a/zin/core/wg.class.php b/lib/zin/core/wg.class.php similarity index 100% rename from zin/core/wg.class.php rename to lib/zin/core/wg.class.php diff --git a/zin/core/wg.func.php b/lib/zin/core/wg.func.php similarity index 100% rename from zin/core/wg.func.php rename to lib/zin/core/wg.func.php diff --git a/zin/core/zin.class.php b/lib/zin/core/zin.class.php similarity index 100% rename from zin/core/zin.class.php rename to lib/zin/core/zin.class.php diff --git a/zin/func.php b/lib/zin/func.php similarity index 100% rename from zin/func.php rename to lib/zin/func.php diff --git a/zin/helper.php b/lib/zin/helper.php old mode 100755 new mode 100644 similarity index 96% rename from zin/helper.php rename to lib/zin/helper.php index 1e05922472..d2d3a82932 --- a/zin/helper.php +++ b/lib/zin/helper.php @@ -44,7 +44,7 @@ function createWg($name, $args) $name = strtolower($name); $wgVer = getWgVer($name); - include_once $app->getBasePath() . 'zin' . DS . 'wg' . DS . $name . DS . "v$wgVer.php"; + include_once __DIR__ . DS . 'wg' . DS . $name . DS . "v$wgVer.php"; $wgName = "\\zin\\$name"; diff --git a/zin/utils/classlist.class.php b/lib/zin/utils/classlist.class.php old mode 100755 new mode 100644 similarity index 100% rename from zin/utils/classlist.class.php rename to lib/zin/utils/classlist.class.php diff --git a/zin/utils/data.class.php b/lib/zin/utils/data.class.php similarity index 100% rename from zin/utils/data.class.php rename to lib/zin/utils/data.class.php diff --git a/zin/utils/dataset.class.php b/lib/zin/utils/dataset.class.php old mode 100755 new mode 100644 similarity index 100% rename from zin/utils/dataset.class.php rename to lib/zin/utils/dataset.class.php diff --git a/zin/utils/debug.func.php b/lib/zin/utils/debug.func.php similarity index 100% rename from zin/utils/debug.func.php rename to lib/zin/utils/debug.func.php diff --git a/zin/utils/deep.func.php b/lib/zin/utils/deep.func.php similarity index 100% rename from zin/utils/deep.func.php rename to lib/zin/utils/deep.func.php diff --git a/zin/utils/flat.func.php b/lib/zin/utils/flat.func.php similarity index 100% rename from zin/utils/flat.func.php rename to lib/zin/utils/flat.func.php diff --git a/zin/utils/hx.class.php b/lib/zin/utils/hx.class.php old mode 100755 new mode 100644 similarity index 100% rename from zin/utils/hx.class.php rename to lib/zin/utils/hx.class.php diff --git a/zin/utils/style.class.php b/lib/zin/utils/style.class.php old mode 100755 new mode 100644 similarity index 100% rename from zin/utils/style.class.php rename to lib/zin/utils/style.class.php diff --git a/zin/wg/actionitem/v1.php b/lib/zin/wg/actionitem/v1.php similarity index 100% rename from zin/wg/actionitem/v1.php rename to lib/zin/wg/actionitem/v1.php diff --git a/zin/wg/avatar/v1.php b/lib/zin/wg/avatar/v1.php similarity index 100% rename from zin/wg/avatar/v1.php rename to lib/zin/wg/avatar/v1.php diff --git a/zin/wg/btn/v1.php b/lib/zin/wg/btn/v1.php old mode 100755 new mode 100644 similarity index 100% rename from zin/wg/btn/v1.php rename to lib/zin/wg/btn/v1.php diff --git a/zin/wg/btngroup/v1.php b/lib/zin/wg/btngroup/v1.php similarity index 100% rename from zin/wg/btngroup/v1.php rename to lib/zin/wg/btngroup/v1.php diff --git a/zin/wg/cell/v1.php b/lib/zin/wg/cell/v1.php similarity index 100% rename from zin/wg/cell/v1.php rename to lib/zin/wg/cell/v1.php diff --git a/zin/wg/center/v1.php b/lib/zin/wg/center/v1.php similarity index 100% rename from zin/wg/center/v1.php rename to lib/zin/wg/center/v1.php diff --git a/zin/wg/checkbox/v1.php b/lib/zin/wg/checkbox/v1.php similarity index 100% rename from zin/wg/checkbox/v1.php rename to lib/zin/wg/checkbox/v1.php diff --git a/zin/wg/checklist/v1.php b/lib/zin/wg/checklist/v1.php similarity index 100% rename from zin/wg/checklist/v1.php rename to lib/zin/wg/checklist/v1.php diff --git a/zin/wg/col/v1.php b/lib/zin/wg/col/v1.php similarity index 100% rename from zin/wg/col/v1.php rename to lib/zin/wg/col/v1.php diff --git a/zin/wg/colorpicker/v1.php b/lib/zin/wg/colorpicker/v1.php similarity index 100% rename from zin/wg/colorpicker/v1.php rename to lib/zin/wg/colorpicker/v1.php diff --git a/zin/wg/control/v1.php b/lib/zin/wg/control/v1.php similarity index 100% rename from zin/wg/control/v1.php rename to lib/zin/wg/control/v1.php diff --git a/zin/wg/datepicker/v1.php b/lib/zin/wg/datepicker/v1.php similarity index 100% rename from zin/wg/datepicker/v1.php rename to lib/zin/wg/datepicker/v1.php diff --git a/zin/wg/datetimepicker/v1.php b/lib/zin/wg/datetimepicker/v1.php similarity index 100% rename from zin/wg/datetimepicker/v1.php rename to lib/zin/wg/datetimepicker/v1.php diff --git a/zin/wg/dropdown/v1.php b/lib/zin/wg/dropdown/v1.php similarity index 100% rename from zin/wg/dropdown/v1.php rename to lib/zin/wg/dropdown/v1.php diff --git a/zin/wg/dtable/css/v1.css b/lib/zin/wg/dtable/css/v1.css similarity index 100% rename from zin/wg/dtable/css/v1.css rename to lib/zin/wg/dtable/css/v1.css diff --git a/zin/wg/dtable/v1.php b/lib/zin/wg/dtable/v1.php similarity index 100% rename from zin/wg/dtable/v1.php rename to lib/zin/wg/dtable/v1.php diff --git a/zin/wg/editor/v1.php b/lib/zin/wg/editor/v1.php similarity index 100% rename from zin/wg/editor/v1.php rename to lib/zin/wg/editor/v1.php diff --git a/zin/wg/featurebar/v1.php b/lib/zin/wg/featurebar/v1.php similarity index 100% rename from zin/wg/featurebar/v1.php rename to lib/zin/wg/featurebar/v1.php diff --git a/zin/wg/fileinput/v1.php b/lib/zin/wg/fileinput/v1.php similarity index 100% rename from zin/wg/fileinput/v1.php rename to lib/zin/wg/fileinput/v1.php diff --git a/zin/wg/form/v1.php b/lib/zin/wg/form/v1.php similarity index 100% rename from zin/wg/form/v1.php rename to lib/zin/wg/form/v1.php diff --git a/zin/wg/formgroup/v1.php b/lib/zin/wg/formgroup/v1.php similarity index 100% rename from zin/wg/formgroup/v1.php rename to lib/zin/wg/formgroup/v1.php diff --git a/zin/wg/formlabel/v1.php b/lib/zin/wg/formlabel/v1.php similarity index 100% rename from zin/wg/formlabel/v1.php rename to lib/zin/wg/formlabel/v1.php diff --git a/zin/wg/formpanel/v1.php b/lib/zin/wg/formpanel/v1.php similarity index 100% rename from zin/wg/formpanel/v1.php rename to lib/zin/wg/formpanel/v1.php diff --git a/zin/wg/formrow/v1.php b/lib/zin/wg/formrow/v1.php similarity index 100% rename from zin/wg/formrow/v1.php rename to lib/zin/wg/formrow/v1.php diff --git a/zin/wg/fragment/v1.php b/lib/zin/wg/fragment/v1.php similarity index 100% rename from zin/wg/fragment/v1.php rename to lib/zin/wg/fragment/v1.php diff --git a/zin/wg/header/v1.php b/lib/zin/wg/header/v1.php similarity index 100% rename from zin/wg/header/v1.php rename to lib/zin/wg/header/v1.php diff --git a/zin/wg/heading/v1.php b/lib/zin/wg/heading/v1.php similarity index 100% rename from zin/wg/heading/v1.php rename to lib/zin/wg/heading/v1.php diff --git a/zin/wg/history/css/v1.css b/lib/zin/wg/history/css/v1.css similarity index 100% rename from zin/wg/history/css/v1.css rename to lib/zin/wg/history/css/v1.css diff --git a/zin/wg/history/v1.php b/lib/zin/wg/history/v1.php similarity index 100% rename from zin/wg/history/v1.php rename to lib/zin/wg/history/v1.php diff --git a/zin/wg/icon/v1.php b/lib/zin/wg/icon/v1.php similarity index 100% rename from zin/wg/icon/v1.php rename to lib/zin/wg/icon/v1.php diff --git a/zin/wg/input/v1.php b/lib/zin/wg/input/v1.php similarity index 100% rename from zin/wg/input/v1.php rename to lib/zin/wg/input/v1.php diff --git a/zin/wg/inputcontrol/v1.php b/lib/zin/wg/inputcontrol/v1.php similarity index 100% rename from zin/wg/inputcontrol/v1.php rename to lib/zin/wg/inputcontrol/v1.php diff --git a/zin/wg/inputgroup/v1.php b/lib/zin/wg/inputgroup/v1.php similarity index 100% rename from zin/wg/inputgroup/v1.php rename to lib/zin/wg/inputgroup/v1.php diff --git a/zin/wg/label/v1.php b/lib/zin/wg/label/v1.php similarity index 100% rename from zin/wg/label/v1.php rename to lib/zin/wg/label/v1.php diff --git a/zin/wg/main/v1.php b/lib/zin/wg/main/v1.php similarity index 100% rename from zin/wg/main/v1.php rename to lib/zin/wg/main/v1.php diff --git a/zin/wg/mainmenu/v1.php b/lib/zin/wg/mainmenu/v1.php similarity index 100% rename from zin/wg/mainmenu/v1.php rename to lib/zin/wg/mainmenu/v1.php diff --git a/zin/wg/menu/v1.php b/lib/zin/wg/menu/v1.php similarity index 100% rename from zin/wg/menu/v1.php rename to lib/zin/wg/menu/v1.php diff --git a/zin/wg/modal/v1.php b/lib/zin/wg/modal/v1.php similarity index 100% rename from zin/wg/modal/v1.php rename to lib/zin/wg/modal/v1.php diff --git a/zin/wg/modaldialog/v1.php b/lib/zin/wg/modaldialog/v1.php similarity index 100% rename from zin/wg/modaldialog/v1.php rename to lib/zin/wg/modaldialog/v1.php diff --git a/zin/wg/modaltrigger/v1.php b/lib/zin/wg/modaltrigger/v1.php similarity index 100% rename from zin/wg/modaltrigger/v1.php rename to lib/zin/wg/modaltrigger/v1.php diff --git a/zin/wg/modulemenu/css/v1.css b/lib/zin/wg/modulemenu/css/v1.css similarity index 100% rename from zin/wg/modulemenu/css/v1.css rename to lib/zin/wg/modulemenu/css/v1.css diff --git a/zin/wg/modulemenu/v1.php b/lib/zin/wg/modulemenu/v1.php similarity index 100% rename from zin/wg/modulemenu/v1.php rename to lib/zin/wg/modulemenu/v1.php diff --git a/zin/wg/nav/v1.php b/lib/zin/wg/nav/v1.php old mode 100755 new mode 100644 similarity index 100% rename from zin/wg/nav/v1.php rename to lib/zin/wg/nav/v1.php diff --git a/zin/wg/navbar/v1.php b/lib/zin/wg/navbar/v1.php similarity index 100% rename from zin/wg/navbar/v1.php rename to lib/zin/wg/navbar/v1.php diff --git a/zin/wg/page/v1.php b/lib/zin/wg/page/v1.php similarity index 100% rename from zin/wg/page/v1.php rename to lib/zin/wg/page/v1.php diff --git a/zin/wg/pagebase/v1.php b/lib/zin/wg/pagebase/v1.php similarity index 100% rename from zin/wg/pagebase/v1.php rename to lib/zin/wg/pagebase/v1.php diff --git a/zin/wg/pageform/v1.php b/lib/zin/wg/pageform/v1.php similarity index 100% rename from zin/wg/pageform/v1.php rename to lib/zin/wg/pageform/v1.php diff --git a/zin/wg/pager/v1.php b/lib/zin/wg/pager/v1.php similarity index 100% rename from zin/wg/pager/v1.php rename to lib/zin/wg/pager/v1.php diff --git a/zin/wg/panel/v1.php b/lib/zin/wg/panel/v1.php similarity index 100% rename from zin/wg/panel/v1.php rename to lib/zin/wg/panel/v1.php diff --git a/zin/wg/picker/v1.php b/lib/zin/wg/picker/v1.php similarity index 100% rename from zin/wg/picker/v1.php rename to lib/zin/wg/picker/v1.php diff --git a/zin/wg/programmenu/css/v1.css b/lib/zin/wg/programmenu/css/v1.css similarity index 100% rename from zin/wg/programmenu/css/v1.css rename to lib/zin/wg/programmenu/css/v1.css diff --git a/zin/wg/programmenu/v1.php b/lib/zin/wg/programmenu/v1.php similarity index 100% rename from zin/wg/programmenu/v1.php rename to lib/zin/wg/programmenu/v1.php diff --git a/zin/wg/radio/v1.php b/lib/zin/wg/radio/v1.php similarity index 100% rename from zin/wg/radio/v1.php rename to lib/zin/wg/radio/v1.php diff --git a/zin/wg/radiolist/v1.php b/lib/zin/wg/radiolist/v1.php similarity index 100% rename from zin/wg/radiolist/v1.php rename to lib/zin/wg/radiolist/v1.php diff --git a/zin/wg/row/v1.php b/lib/zin/wg/row/v1.php similarity index 100% rename from zin/wg/row/v1.php rename to lib/zin/wg/row/v1.php diff --git a/zin/wg/searchform/v1.php b/lib/zin/wg/searchform/v1.php similarity index 100% rename from zin/wg/searchform/v1.php rename to lib/zin/wg/searchform/v1.php diff --git a/zin/wg/searchtoggle/css/v1.css b/lib/zin/wg/searchtoggle/css/v1.css similarity index 100% rename from zin/wg/searchtoggle/css/v1.css rename to lib/zin/wg/searchtoggle/css/v1.css diff --git a/zin/wg/searchtoggle/js/v1.js b/lib/zin/wg/searchtoggle/js/v1.js similarity index 100% rename from zin/wg/searchtoggle/js/v1.js rename to lib/zin/wg/searchtoggle/js/v1.js diff --git a/zin/wg/searchtoggle/v1.php b/lib/zin/wg/searchtoggle/v1.php similarity index 100% rename from zin/wg/searchtoggle/v1.php rename to lib/zin/wg/searchtoggle/v1.php diff --git a/zin/wg/select/v1.php b/lib/zin/wg/select/v1.php similarity index 100% rename from zin/wg/select/v1.php rename to lib/zin/wg/select/v1.php diff --git a/zin/wg/sidebar/css/v1.css b/lib/zin/wg/sidebar/css/v1.css similarity index 100% rename from zin/wg/sidebar/css/v1.css rename to lib/zin/wg/sidebar/css/v1.css diff --git a/zin/wg/sidebar/js/v1.js b/lib/zin/wg/sidebar/js/v1.js similarity index 100% rename from zin/wg/sidebar/js/v1.js rename to lib/zin/wg/sidebar/js/v1.js diff --git a/zin/wg/sidebar/v1.php b/lib/zin/wg/sidebar/v1.php similarity index 100% rename from zin/wg/sidebar/v1.php rename to lib/zin/wg/sidebar/v1.php diff --git a/zin/wg/switcher/v1.php b/lib/zin/wg/switcher/v1.php similarity index 100% rename from zin/wg/switcher/v1.php rename to lib/zin/wg/switcher/v1.php diff --git a/zin/wg/tabs/v1.php b/lib/zin/wg/tabs/v1.php similarity index 100% rename from zin/wg/tabs/v1.php rename to lib/zin/wg/tabs/v1.php diff --git a/zin/wg/textarea/v1.php b/lib/zin/wg/textarea/v1.php similarity index 100% rename from zin/wg/textarea/v1.php rename to lib/zin/wg/textarea/v1.php diff --git a/zin/wg/timepicker/v1.php b/lib/zin/wg/timepicker/v1.php similarity index 100% rename from zin/wg/timepicker/v1.php rename to lib/zin/wg/timepicker/v1.php diff --git a/zin/wg/toolbar/v1.php b/lib/zin/wg/toolbar/v1.php similarity index 100% rename from zin/wg/toolbar/v1.php rename to lib/zin/wg/toolbar/v1.php diff --git a/zin/wg/tooltip/v1.php b/lib/zin/wg/tooltip/v1.php similarity index 100% rename from zin/wg/tooltip/v1.php rename to lib/zin/wg/tooltip/v1.php diff --git a/zin/wg/useravatar/v1.php b/lib/zin/wg/useravatar/v1.php similarity index 100% rename from zin/wg/useravatar/v1.php rename to lib/zin/wg/useravatar/v1.php diff --git a/zin/zentao/pager.func.php b/lib/zin/zentao/pager.func.php similarity index 100% rename from zin/zentao/pager.func.php rename to lib/zin/zentao/pager.func.php diff --git a/zin/zentao/zentao.func.php b/lib/zin/zentao/zentao.func.php similarity index 100% rename from zin/zentao/zentao.func.php rename to lib/zin/zentao/zentao.func.php diff --git a/zin/zin.php b/lib/zin/zin.class.php old mode 100755 new mode 100644 similarity index 100% rename from zin/zin.php rename to lib/zin/zin.class.php diff --git a/zin/zui/toggle.class.php b/lib/zin/zui/toggle.class.php similarity index 100% rename from zin/zui/toggle.class.php rename to lib/zin/zui/toggle.class.php diff --git a/zin/zui/toggle.func.php b/lib/zin/zui/toggle.func.php similarity index 100% rename from zin/zui/toggle.func.php rename to lib/zin/zui/toggle.func.php diff --git a/zin/zui/zui.class.php b/lib/zin/zui/zui.class.php similarity index 100% rename from zin/zui/zui.class.php rename to lib/zin/zui/zui.class.php diff --git a/zin/zui/zui.func.php b/lib/zin/zui/zui.func.php similarity index 100% rename from zin/zui/zui.func.php rename to lib/zin/zui/zui.func.php