diff --git a/fhem/contrib/YAF/CHANGED b/fhem/contrib/YAF/CHANGED new file mode 100644 index 000000000..1b5aa242e --- /dev/null +++ b/fhem/contrib/YAF/CHANGED @@ -0,0 +1 @@ +- Added control_yaf.txt to support update \ No newline at end of file diff --git a/fhem/contrib/YAF/FHEM/.project b/fhem/contrib/YAF/FHEM/.project new file mode 100644 index 000000000..8efac8e8b --- /dev/null +++ b/fhem/contrib/YAF/FHEM/.project @@ -0,0 +1,17 @@ + + + yaf_on_fhemsvn + + + + + + org.epic.perleditor.perlbuilder + + + + + + org.epic.perleditor.perlnature + + diff --git a/fhem/contrib/YAF/01_YAF.pm b/fhem/contrib/YAF/FHEM/01_YAF.pm similarity index 100% rename from fhem/contrib/YAF/01_YAF.pm rename to fhem/contrib/YAF/FHEM/01_YAF.pm diff --git a/fhem/contrib/YAF/Makefile b/fhem/contrib/YAF/FHEM/Makefile similarity index 100% rename from fhem/contrib/YAF/Makefile rename to fhem/contrib/YAF/FHEM/Makefile diff --git a/fhem/contrib/YAF/YAF/YAFConfig.pm b/fhem/contrib/YAF/FHEM/YAF/YAFConfig.pm similarity index 100% rename from fhem/contrib/YAF/YAF/YAFConfig.pm rename to fhem/contrib/YAF/FHEM/YAF/YAFConfig.pm diff --git a/fhem/contrib/YAF/YAF/YAFWidgets.pm b/fhem/contrib/YAF/FHEM/YAF/YAFWidgets.pm similarity index 100% rename from fhem/contrib/YAF/YAF/YAFWidgets.pm rename to fhem/contrib/YAF/FHEM/YAF/YAFWidgets.pm diff --git a/fhem/contrib/YAF/YAF/widgets/fs20easylamp/fs20easylamp.pm b/fhem/contrib/YAF/FHEM/YAF/widgets/fs20easylamp/fs20easylamp.pm similarity index 100% rename from fhem/contrib/YAF/YAF/widgets/fs20easylamp/fs20easylamp.pm rename to fhem/contrib/YAF/FHEM/YAF/widgets/fs20easylamp/fs20easylamp.pm diff --git a/fhem/contrib/YAF/YAF/widgets/fs20easylamp/www/.gitkeep b/fhem/contrib/YAF/FHEM/YAF/widgets/fs20easylamp/www/.gitkeep similarity index 100% rename from fhem/contrib/YAF/YAF/widgets/fs20easylamp/www/.gitkeep rename to fhem/contrib/YAF/FHEM/YAF/widgets/fs20easylamp/www/.gitkeep diff --git a/fhem/contrib/YAF/YAF/widgets/fs20st/fs20st.pm b/fhem/contrib/YAF/FHEM/YAF/widgets/fs20st/fs20st.pm similarity index 100% rename from fhem/contrib/YAF/YAF/widgets/fs20st/fs20st.pm rename to fhem/contrib/YAF/FHEM/YAF/widgets/fs20st/fs20st.pm diff --git a/fhem/contrib/YAF/YAF/widgets/fs20st/www/.gitkeep b/fhem/contrib/YAF/FHEM/YAF/widgets/fs20st/www/.gitkeep similarity index 100% rename from fhem/contrib/YAF/YAF/widgets/fs20st/www/.gitkeep rename to fhem/contrib/YAF/FHEM/YAF/widgets/fs20st/www/.gitkeep diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_222222_256x240.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_222222_256x240.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_222222_256x240.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_222222_256x240.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_2e83ff_256x240.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_2e83ff_256x240.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_2e83ff_256x240.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_2e83ff_256x240.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_454545_256x240.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_454545_256x240.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_454545_256x240.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_454545_256x240.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_888888_256x240.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_888888_256x240.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_888888_256x240.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_888888_256x240.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_cd0a0a_256x240.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/images/ui-icons_cd0a0a_256x240.png rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/images/ui-icons_cd0a0a_256x240.png diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.css b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.css similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.css rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.css diff --git a/fhem/contrib/YAF/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.min.css b/fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.min.css similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.min.css rename to fhem/contrib/YAF/FHEM/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.min.css diff --git a/fhem/contrib/YAF/YAF/www/css/yaf.css b/fhem/contrib/YAF/FHEM/YAF/www/css/yaf.css similarity index 100% rename from fhem/contrib/YAF/YAF/www/css/yaf.css rename to fhem/contrib/YAF/FHEM/YAF/www/css/yaf.css diff --git a/fhem/contrib/YAF/YAF/www/img/1og.jpeg b/fhem/contrib/YAF/FHEM/YAF/www/img/1og.jpeg similarity index 100% rename from fhem/contrib/YAF/YAF/www/img/1og.jpeg rename to fhem/contrib/YAF/FHEM/YAF/www/img/1og.jpeg diff --git a/fhem/contrib/YAF/YAF/www/img/eg.jpeg b/fhem/contrib/YAF/FHEM/YAF/www/img/eg.jpeg similarity index 100% rename from fhem/contrib/YAF/YAF/www/img/eg.jpeg rename to fhem/contrib/YAF/FHEM/YAF/www/img/eg.jpeg diff --git a/fhem/contrib/YAF/YAF/www/img/lamp_off.png b/fhem/contrib/YAF/FHEM/YAF/www/img/lamp_off.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/img/lamp_off.png rename to fhem/contrib/YAF/FHEM/YAF/www/img/lamp_off.png diff --git a/fhem/contrib/YAF/YAF/www/img/lamp_on.png b/fhem/contrib/YAF/FHEM/YAF/www/img/lamp_on.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/img/lamp_on.png rename to fhem/contrib/YAF/FHEM/YAF/www/img/lamp_on.png diff --git a/fhem/contrib/YAF/YAF/www/img/loading.gif b/fhem/contrib/YAF/FHEM/YAF/www/img/loading.gif similarity index 100% rename from fhem/contrib/YAF/YAF/www/img/loading.gif rename to fhem/contrib/YAF/FHEM/YAF/www/img/loading.gif diff --git a/fhem/contrib/YAF/YAF/www/img/wetter.png b/fhem/contrib/YAF/FHEM/YAF/www/img/wetter.png similarity index 100% rename from fhem/contrib/YAF/YAF/www/img/wetter.png rename to fhem/contrib/YAF/FHEM/YAF/www/img/wetter.png diff --git a/fhem/contrib/YAF/YAF/www/js/combobox.js b/fhem/contrib/YAF/FHEM/YAF/www/js/combobox.js similarity index 100% rename from fhem/contrib/YAF/YAF/www/js/combobox.js rename to fhem/contrib/YAF/FHEM/YAF/www/js/combobox.js diff --git a/fhem/contrib/YAF/YAF/www/js/jquery-1.8.2.js b/fhem/contrib/YAF/FHEM/YAF/www/js/jquery-1.8.2.js similarity index 100% rename from fhem/contrib/YAF/YAF/www/js/jquery-1.8.2.js rename to fhem/contrib/YAF/FHEM/YAF/www/js/jquery-1.8.2.js diff --git a/fhem/contrib/YAF/YAF/www/js/jquery-ui-1.9.1.custom.js b/fhem/contrib/YAF/FHEM/YAF/www/js/jquery-ui-1.9.1.custom.js similarity index 100% rename from fhem/contrib/YAF/YAF/www/js/jquery-ui-1.9.1.custom.js rename to fhem/contrib/YAF/FHEM/YAF/www/js/jquery-ui-1.9.1.custom.js diff --git a/fhem/contrib/YAF/YAF/www/js/jquery-ui-1.9.1.custom.min.js b/fhem/contrib/YAF/FHEM/YAF/www/js/jquery-ui-1.9.1.custom.min.js similarity index 100% rename from fhem/contrib/YAF/YAF/www/js/jquery-ui-1.9.1.custom.min.js rename to fhem/contrib/YAF/FHEM/YAF/www/js/jquery-ui-1.9.1.custom.min.js diff --git a/fhem/contrib/YAF/YAF/www/js/jquery.ui.touch-punch.min.js b/fhem/contrib/YAF/FHEM/YAF/www/js/jquery.ui.touch-punch.min.js similarity index 100% rename from fhem/contrib/YAF/YAF/www/js/jquery.ui.touch-punch.min.js rename to fhem/contrib/YAF/FHEM/YAF/www/js/jquery.ui.touch-punch.min.js diff --git a/fhem/contrib/YAF/YAF/www/js/yaf-basics.js b/fhem/contrib/YAF/FHEM/YAF/www/js/yaf-basics.js similarity index 100% rename from fhem/contrib/YAF/YAF/www/js/yaf-basics.js rename to fhem/contrib/YAF/FHEM/YAF/www/js/yaf-basics.js diff --git a/fhem/contrib/YAF/YAF/www/js/yaf-dialogs.js b/fhem/contrib/YAF/FHEM/YAF/www/js/yaf-dialogs.js similarity index 100% rename from fhem/contrib/YAF/YAF/www/js/yaf-dialogs.js rename to fhem/contrib/YAF/FHEM/YAF/www/js/yaf-dialogs.js diff --git a/fhem/contrib/YAF/YAF/www/yaf.htm b/fhem/contrib/YAF/FHEM/YAF/www/yaf.htm similarity index 100% rename from fhem/contrib/YAF/YAF/www/yaf.htm rename to fhem/contrib/YAF/FHEM/YAF/www/yaf.htm diff --git a/fhem/contrib/YAF/YAF/xml/xmlSchema.xsd b/fhem/contrib/YAF/FHEM/YAF/xml/xmlSchema.xsd similarity index 100% rename from fhem/contrib/YAF/YAF/xml/xmlSchema.xsd rename to fhem/contrib/YAF/FHEM/YAF/xml/xmlSchema.xsd diff --git a/fhem/contrib/YAF/YAF/xml/yafConfig.xml.example b/fhem/contrib/YAF/FHEM/YAF/xml/yafConfig.xml.example similarity index 100% rename from fhem/contrib/YAF/YAF/xml/yafConfig.xml.example rename to fhem/contrib/YAF/FHEM/YAF/xml/yafConfig.xml.example diff --git a/fhem/contrib/YAF/fhem.cfg b/fhem/contrib/YAF/FHEM/fhem.cfg similarity index 100% rename from fhem/contrib/YAF/fhem.cfg rename to fhem/contrib/YAF/FHEM/fhem.cfg diff --git a/fhem/contrib/YAF/controls_yaf.txt b/fhem/contrib/YAF/controls_yaf.txt new file mode 100644 index 000000000..c68ed79fd --- /dev/null +++ b/fhem/contrib/YAF/controls_yaf.txt @@ -0,0 +1,50 @@ +DIR FHEM/YAF +DIR FHEM/YAF/widgets +DIR FHEM/YAF/widgets/fs20easylamp +DIR FHEM/YAF/widgets/fs20easylamp/www +DIR FHEM/YAF/widgets/fs20st +DIR FHEM/YAF/widgets/fs20st/www +DIR FHEM/YAF/www +DIR FHEM/YAF/www/css +DIR FHEM/YAF/www/smoothness +DIR FHEM/YAF/www/smoothness/images +DIR FHEM/YAF/www/img +DIR FHEM/YAF/www/js +DIR FHEM/YAF/xml +UPD 2013-05-15_20:00:00 48 FHEM/01_YAF.pm +UPD 2013-05-15_20:00:00 57 FHEM/01_YAFWebserver.pm +UPD 2013-05-15_20:00:00 6590 FHEM/YAF/widgets/fs20st/fs20st.pm +UPD 2013-05-15_20:00:00 6617 FHEM/YAF/widgets/fs20easylamp/fs20easylamp.pm +UPD 2013-05-15_20:00:00 2608 FHEM/YAF/www/img/loading.gif +UPD 2013-05-15_20:00:00 766 FHEM/YAF/www/img/lamp_off.png +UPD 2013-05-15_20:00:00 19226 FHEM/YAF/www/img/background.png +UPD 2013-05-15_20:00:00 831 FHEM/YAF/www/img/lamp_on.png +UPD 2013-05-15_20:00:00 7146 FHEM/YAF/www/yaf.htm +UPD 2013-05-15_20:00:00 14671 FHEM/YAF/www/js/yaf-dialogs.js +UPD 2013-05-15_20:00:00 3433 FHEM/YAF/www/js/combobox.js +UPD 2013-05-15_20:00:00 4593 FHEM/YAF/www/js/jquery.ui.touch-punch.min.js +UPD 2013-05-15_20:00:00 237176 FHEM/YAF/www/js/jquery-ui-1.9.1.custom.min.js +UPD 2013-05-15_20:00:00 13875 FHEM/YAF/www/js/yaf-basics.js +UPD 2013-05-15_20:00:00 448301 FHEM/YAF/www/js/jquery-ui-1.9.1.custom.js +UPD 2013-05-15_20:00:00 265218 FHEM/YAF/www/js/jquery-1.8.2.js +UPD 2013-05-15_20:00:00 2313 FHEM/YAF/www/css/yaf.css +UPD 2013-05-15_20:00:00 30900 FHEM/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.css +UPD 2013-05-15_20:00:00 4369 FHEM/YAF/www/css/smoothness/images/ui-icons_222222_256x240.png +UPD 2013-05-15_20:00:00 180 FHEM/YAF/www/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png +UPD 2013-05-15_20:00:00 178 FHEM/YAF/www/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png +UPD 2013-05-15_20:00:00 4369 FHEM/YAF/www/css/smoothness/images/ui-icons_888888_256x240.png +UPD 2013-05-15_20:00:00 111 FHEM/YAF/www/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png +UPD 2013-05-15_20:00:00 4369 FHEM/YAF/www/css/smoothness/images/ui-icons_cd0a0a_256x240.png +UPD 2013-05-15_20:00:00 119 FHEM/YAF/www/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png +UPD 2013-05-15_20:00:00 120 FHEM/YAF/www/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png +UPD 2013-05-15_20:00:00 4369 FHEM/YAF/www/css/smoothness/images/ui-icons_454545_256x240.png +UPD 2013-05-15_20:00:00 110 FHEM/YAF/www/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png +UPD 2013-05-15_20:00:00 105 FHEM/YAF/www/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png +UPD 2013-05-15_20:00:00 4369 FHEM/YAF/www/css/smoothness/images/ui-icons_2e83ff_256x240.png +UPD 2013-05-15_20:00:00 101 FHEM/YAF/www/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png +UPD 2013-05-15_20:00:00 26086 FHEM/YAF/www/css/smoothness/jquery-ui-1.9.1.custom.min.css +UPD 2013-05-15_20:00:00 1975 FHEM/YAF/xml/yafConfig.xml.example +UPD 2013-05-15_20:00:00 3641 FHEM/YAF/xml/xmlSchema.xsd +UPD 2013-05-15_20:00:00 2828 FHEM/YAF/xml/yafConfig.xml +UPD 2013-05-15_20:00:00 16747 FHEM/YAF/YAFConfig.pm +UPD 2013-05-15_20:00:00 3439 FHEM/YAF/YAFWidgets.pm