diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-08 11:59:45 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-10-08 11:59:45 +0000 |
| commit | 0ecd87f94b017bed32e7a1511a9f3b60ac2621b2 (patch) | |
| tree | b4b65ccaa6a52b737677f87ff5ae657a3333add4 /frontends/php/include | |
| parent | f99327ef29f466bac40fdd47413d1a9cab9b3690 (diff) | |
| download | zabbix-0ecd87f94b017bed32e7a1511a9f3b60ac2621b2.tar.gz zabbix-0ecd87f94b017bed32e7a1511a9f3b60ac2621b2.tar.xz zabbix-0ecd87f94b017bed32e7a1511a9f3b60ac2621b2.zip | |
- [DEV-46] merged rev. 4843:4844 of branches/1.4/ (Artem) [added "save&return" button in acknowledgement]
git-svn-id: svn://svn.zabbix.com/trunk@4848 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/forms.inc.php | 3 | ||||
| -rw-r--r-- | frontends/php/include/locales/en_gb.inc.php | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/frontends/php/include/forms.inc.php b/frontends/php/include/forms.inc.php index 2589473e..2e010c9d 100644 --- a/frontends/php/include/forms.inc.php +++ b/frontends/php/include/forms.inc.php @@ -647,11 +647,13 @@ { $title = S_ACKNOWLEDGE_ALARM_BY; $btn_txt = S_ACKNOWLEDGE; + $btn_txt2 = S_ACKNOWLEDGE.' '.S_AND_SYMB.' '.S_RETURN; } else { $title = S_ADD_COMMENT_BY; $btn_txt = S_SAVE; + $btn_txt2 = S_SAVE.' '.S_AND_SYMB.' '.S_RETURN; } $frmMsg= new CFormTable($title." \"".$USER_DETAILS["alias"]."\""); @@ -660,6 +662,7 @@ $frmMsg->AddRow(S_MESSAGE, new CTextArea("message","",80,6)); + $frmMsg->AddItemToBottomRow(new CButton("saveandreturn",$btn_txt2)); $frmMsg->AddItemToBottomRow(new CButton("save",$btn_txt)); $frmMsg->AddItemToBottomRow(new CButtonCancel(url_param('eventid'))); diff --git a/frontends/php/include/locales/en_gb.inc.php b/frontends/php/include/locales/en_gb.inc.php index 6f2deca4..b57fb589 100644 --- a/frontends/php/include/locales/en_gb.inc.php +++ b/frontends/php/include/locales/en_gb.inc.php @@ -188,6 +188,7 @@ // acknow.php 'S_ACKNOWLEDGES'=> 'Acknowledges', 'S_ACKNOWLEDGE'=> 'Acknowledge', + 'S_RETURN'=> 'Return', 'S_ACKNOWLEDGE_ALARM_BY'=> 'Acknowledge alarm by', 'S_ADD_COMMENT_BY'=> 'Add comment by', 'S_COMMENT_ADDED'=> 'Comment added', @@ -283,6 +284,7 @@ 'S_AND_OR_BIG'=> 'AND / OR', 'S_AND_BIG'=> 'AND', 'S_AND'=> 'and', + 'S_AND_SYMB'=> '&', 'S_OR_BIG'=> 'OR', 'S_OR'=> 'or', 'S_TYPE_OF_CALCULATION'=> 'Type of calculation', |