Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions src/webui/www/api/methods.conf
Original file line number Diff line number Diff line change
Expand Up @@ -1235,20 +1235,6 @@ User.setLanguage {
ARGUMENTS {_session_id_ userName userLang}
}

User.getReGaVersion {
LEVEL NONE
SCRIPT_FILE user/getregaversion.tcl
INFO {Ermittelt die gew�hlte ReGaVersion}
ARGUMENTS {}
}

User.setReGaVersion {
LEVEL USER
SCRIPT_FILE user/setregaversion.tcl
INFO {Speichert die gew�hlte ReGaVersion}
ARGUMENTS {_session_id_ ReGaVersion}
}

User.existsCertificate {
LEVEL ADMIN
SCRIPT_FILE user/existscertificate.tcl
Expand Down
26 changes: 0 additions & 26 deletions src/webui/www/api/methods/user/getregaversion.tcl

This file was deleted.

13 changes: 0 additions & 13 deletions src/webui/www/api/methods/user/setregaversion.tcl

This file was deleted.

79 changes: 0 additions & 79 deletions src/webui/www/config/cp_maintenance.cgi
Original file line number Diff line number Diff line change
Expand Up @@ -539,85 +539,6 @@ proc action_put_page {} {
}
}

# Version Logikschicht
table_row {class="CLASS20902 j_noForcedUpdate j_fwUpdateOnly"} {

table_data {class="CLASS20903"} $styleMaxWidth {
puts "\${lblTDRegaVersion}"
}

table_data {class="CLASS20904"} {

table {class="CLASS20909"} {
table_row {
table_data {
puts "\${dialogHelpInfoLblVersion}"
}
table_data {align="left"} {
puts "<select id='selectedReGaVersion'>"
puts "<option value='NORMAL'>\${optionReGaNORMAL}</option>"
# puts "<option value='LEGACY'>\${optionReGaLEGACY}</option>"
puts "<option value='COMMUNITY'>\${optionReGaCOMMUNITY}</option>"
puts "</select>"
}
}

table_row {
table_data {}
table_data {align="left"} {
division {class="popupControls CLASS20905"} {
division {class="CLASS20919"} {style="margin-top:10px; margin-left:0px;"} {onClick="saveRegaVersion(this);"} {
puts "\${btnSave}"
}
}
}
}
}
}

table_data {align="left"} {class="CLASS20904"} {
# division {Class="StdTableBtnHelp"} {puts "<img id='showReGaVersionHelp' src='/ise/img/help.png'>"}
division {Class="StdTableBtnHelp"} {puts "\${lblTDReGaVersionHelp}"}
}
}

cgi_javascript {
puts "var url = \"$env(SCRIPT_NAME)?sid=\" + SessionId;"
puts {

jQuery("#showReGaVersionHelp").click(function() {
MessageBox.show(translateKey("tooltipHelp"), translateKey("lblTDReGaVersionHelp"), "", 600, 250);
});

homematic("User.getReGaVersion",{}, function(result) {
if (result) {
jQuery("#selectedReGaVersion").val(result);
} else {
jQuery("#selectedReGaVersion").val("NORMAL");
}
});

saveRegaVersion = function(elm) {
jQuery(elm).css({"border-width" : "2px"});
var selectedReGa = jQuery("#selectedReGaVersion").val();
homematic("User.setReGaVersion", {"ReGaVersion": selectedReGa}, function() {
jQuery(elm).css({"border-width" : "1px"});

var dlgYesNo = new YesNoDialog(translateKey("dialogPerformRebootTitle"), translateKey("dialogRestart2ChanceReGaVersion"), function(result) {
if (result == YesNoDialog.RESULT_YES)
{
dlgPopup.hide();
dlgPopup.setWidth(400);
dlgPopup.LoadFromFile(url, "action=reboot_confirm");
}
});
dlgYesNo.btnTextYes(translateKey("dialogBtnPerformRestart"));
dlgYesNo.btnTextNo(translateKey("dialogBtnPerformLaterRestart"));
});
}
}
}

table_row {class="CLASS20902 j_noForcedUpdate j_fwUpdateOnly"} {
table_data {class="CLASS20903"} $styleMaxWidth {
#puts "Fehler-<br>"
Expand Down
1 change: 0 additions & 1 deletion src/webui/www/webui/js/lang/de/translate.lang.extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,6 @@ jQuery.extend(true,langJSON, {
"btnPresenceDetectionFalse" : "Pr%E4senzerkennung einschalten",
"btnPresenceDetectionTrue" : "Pr%E4senzerkennung ausschalten",
"btnResetPresence" : "Reset Status",
"dialogRestart2ChanceReGaVersion" : "Damit die %C4nderung der Logikschicht-Version wirksam wird, muss die " +HMIdentifier.de.CCUShortName + " neu gestartet werden.",
"dialogBtnPerformLaterRestart" : "Sp%E4ter",
"dialogLblAckSecurityHint" : "Ich habe die obige Warnung gelesen!",
"btnNext" : "Weiter",
Expand Down
1 change: 0 additions & 1 deletion src/webui/www/webui/js/lang/de/translate.lang.help.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ jQuery.extend(true, langJSON, {
"<div>Diese Einstellung hat nur Auswirkungen auf gro&szlig;e Zeitr%E4ume (Woche/Monat/Jahr)</div>",
"helpOsramLightify" : "Hier stellen Sie die Kopplung zwischen "+HMIdentifier.de.CCUShortName+" und <b>OSRAM-Lightify</b> her. Mehr Informationen finden Sie hier:",
"helpPhilipsHue" : "Hier stellen Sie die Kopplung zwischen "+HMIdentifier.de.CCUShortName+" und <b>Philips-Hue</b> her. Mehr Informationen finden Sie hier:",
"lblTDReGaVersionHelp" : "Hier k%F6nnen Sie festlegen, welche Version der Logikschicht in der CCU verwendet werden soll. Wechseln Sie zur Version <b>Kompatibilit%E4tsmodus</b>, wenn Sie Probleme mit %E4lteren Homematic Skripten haben.",

"helpPartyModeWithinPrograms" : "Wenn Sie den Urlaubsmodus w%E4hlen, m%FCssen Sie zus%E4tzlich folgende Parameter setzen:",
"dialogSettingsCMHintSoftwareUpdate3a" : "Bringen Sie eventuell installierte Zusatzmodule vor dem Update auf die aktuelle Version!",
Expand Down
1 change: 0 additions & 1 deletion src/webui/www/webui/js/lang/de/translate.lang.label.js
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ jQuery.extend(true,langJSON, {
"lblSysConfCoupling1" : "DESCRIPTION",
"lblSysConfSetPowerCost" : "Energiekostenverwaltung",
"lblSystemKey" : "Systemtaste",
"lblTDRegaVersion" : "Logikschicht<br/>Version",
"lblTeachInKEY" : "KEY",
"lblTeachInSGTIN" : "SGTIN",
"lblText" : "Text",
Expand Down
3 changes: 0 additions & 3 deletions src/webui/www/webui/js/lang/de/translate.lang.option.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ jQuery.extend(true, langJSON, {
"optionRGBWControllerPrg6" : "TV-Simulation",
"optionRadiator" : "Radiator",
"optionRainbow" : "Regenbogen",
"optionReGaCOMMUNITY" : "Standard",
"optionReGaLEGACY" : "Legacy",
"optionReGaNORMAL" : "Kompatibilit%E4tsmodus",
"optionRelayInactive" : "Ger%E4t nicht aktiv",
"optionRelayOffDelay05S" : "Standby nach 0,5 s.",
"optionRelayOffDelay10S" : "Standby nach 10 s.",
Expand Down
1 change: 0 additions & 1 deletion src/webui/www/webui/js/lang/en/translate.lang.extension.js
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,6 @@ jQuery.extend(true, langJSON, {
"btnPresenceDetectionFalse" : "Switch on presence detection",
"btnPresenceDetectionTrue" : "Switch off presence detection",
"btnResetPresence" : "Reset status",
"dialogRestart2ChanceReGaVersion" : "For the change of the logic tier version to apply, the " +HMIdentifier.en.CCUShortName + " must be restarted.",
"dialogBtnPerformLaterRestart" : "Later",
"dialogLblAckSecurityHint" : "I have read the above warning",
"btnNext" : "Next",
Expand Down
1 change: 0 additions & 1 deletion src/webui/www/webui/js/lang/en/translate.lang.help.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ jQuery.extend(true, langJSON, {

"helpOsramLightify" : "You can create the pairing between the "+HMIdentifier.en.CCUShortName+" and <b>OSRAM Lightify</b> here. Please find further information here:",
"helpPhilipsHue" : "You can create the pairing between the "+HMIdentifier.en.CCUShortName+" and <b>Philips Hue</b> here. Please find further information here:",
"lblTDReGaVersionHelp" : "Here you can define, which logic layer version of the CCU should be used. You can change to <b>Compatibility mode</b> if you have problems with older Homematic scripts.",
"helpPartyModeWithinPrograms" : "If you select the holiday mode, you have to set the following parameters as well:",
"dialogSettingsCMHintSoftwareUpdate3a" : "Update any additional modules installed to the latest version before installation of the update!",

Expand Down
1 change: 0 additions & 1 deletion src/webui/www/webui/js/lang/en/translate.lang.label.js
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,6 @@ jQuery.extend(true,langJSON, {
"lblSysConfCoupling1" : "DESCRIPTION",
"lblSysConfSetPowerCost" : "Set the price per kWh",
"lblSystemKey" : "System button",
"lblTDRegaVersion" : "Logic tier<br/>version",
"lblTeachInKEY" : "KEY",
"lblTeachInSGTIN" : "SGTIN",
"lblText" : "Text",
Expand Down
3 changes: 0 additions & 3 deletions src/webui/www/webui/js/lang/en/translate.lang.option.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,6 @@ jQuery.extend(true, langJSON, {
"optionRGBWControllerPrg6" : "TV simulation",
"optionRadiator" : "Radiator",
"optionRainbow" : "Rainbow",
"optionReGaCOMMUNITY" : "Standard",
"optionReGaLEGACY" : "Legacy",
"optionReGaNORMAL" : "Compatibility mode",
"optionRelayInactive" : "Device not active",
"optionRelayOffDelay05S" : "Standby after 0,5 s.",
"optionRelayOffDelay10S" : "Standby after 10 s.",
Expand Down