extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

missing language entrys and setting the referer to the uical->view_menuaction value. this way after save/apply/cancel you get back to the choosen

Browse Source 
view
This commit is contained in:
Klaus Leithoff 2008-01-16 14:49:02 +00:00
parent 086783e462
commit 1812979a6b
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
calendar/inc/class.uiforms.inc.php
View File

@ -156,6 +156,7 @@ class uiforms extends uical
*/ */
function process_edit($content) function process_edit($content)
{ {
$referer=$this->view_menuaction;
list($button) = @each($content['button']); list($button) = @each($content['button']);
if (!$button && $content['action']) $button = $content['action']; // action selectbox if (!$button && $content['action']) $button = $content['action']; // action selectbox
unset($content['button']); unset($content['action']); unset($content['button']); unset($content['action']);
@ -298,7 +299,7 @@ class uiforms extends uical
if (!$preserv['no_popup']) if (!$preserv['no_popup'])
{ {
$js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array( $js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array(
'menuaction' => $content['referer'], 'menuaction' => $referer,
'msg' => $msg, 'msg' => $msg,
))).'\';'; ))).'\';';
} }
@ -318,7 +319,7 @@ class uiforms extends uical
'view' => $view, 'view' => $view,
'edit_single' => $content['edit_single'], 'edit_single' => $content['edit_single'],
'actual_date' => $content['actual_date'], 'actual_date' => $content['actual_date'],
'referer' => $content['referer'], 'referer' => $referer,
'no_popup' => $content['no_popup'], 'no_popup' => $content['no_popup'],
$this->tabs => $content[$this->tabs], $this->tabs => $content[$this->tabs],
); );
@ -422,7 +423,7 @@ class uiforms extends uical
htmlspecialchars($GLOBALS['egw']->link('/index.php',array( htmlspecialchars($GLOBALS['egw']->link('/index.php',array(
'menuaction' => 'calendar.uiforms.edit', 'menuaction' => 'calendar.uiforms.edit',
'cal_id' => $content['id'], 'cal_id' => $content['id'],
'referer' => $content['referer'], 'referer' => $referer,
))).'">','</a>'); ))).'">','</a>');
$noerror=false; $noerror=false;
@ -437,7 +438,7 @@ class uiforms extends uical
$this->link->link('calendar',$event['id'],$content['link_to']['to_id']); $this->link->link('calendar',$event['id'],$content['link_to']['to_id']);
} }
$js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array( $js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array(
'menuaction' => $content['referer'], 'menuaction' => $referer,
'msg' => $msg, 'msg' => $msg,
))).'\';'; ))).'\';';
@ -456,7 +457,7 @@ class uiforms extends uical
if($content['cancel_needs_refresh']) if($content['cancel_needs_refresh'])
{ {
$js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array( $js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array(
'menuaction' => $content['referer'], 'menuaction' => $referer,
'msg' => $msg, 'msg' => $msg,
))).'\';'; ))).'\';';
} }
@ -467,7 +468,7 @@ class uiforms extends uical
{ {
$msg = lang('Event deleted'); $msg = lang('Event deleted');
$js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array( $js = 'opener.location.href=\''.addslashes($GLOBALS['egw']->link('/index.php',array(
'menuaction' => $content['referer'], 'menuaction' => $referer,
'msg' => $msg, 'msg' => $msg,
))).'\';'; ))).'\';';
} }
@ -527,7 +528,7 @@ class uiforms extends uical
if ($content['no_popup']) if ($content['no_popup'])
{ {
$GLOBALS['egw']->redirect_link('/index.php',array( $GLOBALS['egw']->redirect_link('/index.php',array(
'menuaction' => $content['referer'], 'menuaction' => $referer,
'msg' => $msg, 'msg' => $msg,
)); ));
} }

2
calendar/setup/egw_de.lang
View File

@ -50,6 +50,7 @@ close the window calendar de Schließt das Fenster
compose a mail to all participants after the event is saved calendar de Schreibe eine Mail an alle Teilnehmer nachdem der Termin gespeichert wurde compose a mail to all participants after the event is saved calendar de Schreibe eine Mail an alle Teilnehmer nachdem der Termin gespeichert wurde
copy of: calendar de Kopie von: copy of: calendar de Kopie von:
copy this event calendar de Kopiert diesen Termin copy this event calendar de Kopiert diesen Termin
copy your changes to the clipboard, %1reload the entry%2 and merge them. calendar de Kopieren Sie ihre Änderungen in die Zwischenablage, %1laden den Eintrag neu%2 und fügen diese wieder ein.
countries calendar de Länder countries calendar de Länder
country calendar de Land country calendar de Land
create an exception for the given date calendar de Erzeugt eine Ausnahme am angegebenen Datum create an exception for the given date calendar de Erzeugt eine Ausnahme am angegebenen Datum
@ -101,6 +102,7 @@ error: importing the ical calendar de Fehler: beim Importieren des iCal
error: no participants selected !!! calendar de Fehler: keine Teilnehmer ausgewählt !!! error: no participants selected !!! calendar de Fehler: keine Teilnehmer ausgewählt !!!
error: saving the event !!! calendar de Fehler: beim Speichern des Termins !!! error: saving the event !!! calendar de Fehler: beim Speichern des Termins !!!
error: starttime has to be before the endtime !!! calendar de Fehler: Startzeit muß vor Endzeit liegen !!! error: starttime has to be before the endtime !!! calendar de Fehler: Startzeit muß vor Endzeit liegen !!!
error: the entry has been updated since you opened it for editing! calendar de Fehler: der Eintrag wurde geändert seit Sie ihn zum Bearbeiten geöffnet haben!
event copied - the copy can now be edited calendar de Termin kopiert - die Kopie kann jetzt bearbeitet werden event copied - the copy can now be edited calendar de Termin kopiert - die Kopie kann jetzt bearbeitet werden
event deleted calendar de Termin gelöscht event deleted calendar de Termin gelöscht
event details follow calendar de Details zum Termin folgen event details follow calendar de Details zum Termin folgen

2
calendar/setup/egw_en.lang
View File

@ -50,6 +50,7 @@ close the window calendar en Close the window
compose a mail to all participants after the event is saved calendar en compose a mail to all participants after the event is saved compose a mail to all participants after the event is saved calendar en compose a mail to all participants after the event is saved
copy of: calendar en Copy of: copy of: calendar en Copy of:
copy this event calendar en Copy this event copy this event calendar en Copy this event
copy your changes to the clipboard, %1reload the entry%2 and merge them. calendar en Copy your changes to the clipboard, %1reload the entry%2 and merge them.
countries calendar en Countries countries calendar en Countries
country calendar en Country country calendar en Country
create an exception for the given date calendar en Create an exception for the given date create an exception for the given date calendar en Create an exception for the given date
@ -101,6 +102,7 @@ error: importing the ical calendar en Error: importing the iCal
error: no participants selected !!! calendar en Error: no participants selected !!! error: no participants selected !!! calendar en Error: no participants selected !!!
error: saving the event !!! calendar en Error: saving the event !!! error: saving the event !!! calendar en Error: saving the event !!!
error: starttime has to be before the endtime !!! calendar en Error: Starttime has to be before the endtime !!! error: starttime has to be before the endtime !!! calendar en Error: Starttime has to be before the endtime !!!
error: the entry has been updated since you opened it for editing! calendar en Error: the entry has been updated since you opened it for editing!
event copied - the copy can now be edited calendar en Event copied - the copy can now be edited event copied - the copy can now be edited calendar en Event copied - the copy can now be edited
event deleted calendar en Event deleted event deleted calendar en Event deleted
event details follow calendar en Event Details follow event details follow calendar en Event Details follow