holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some changes on show-dialog

Browse Source
This commit is contained in:
wnz_gh05t 2005-06-12 10:09:12 +00:00
parent cf36deec92
commit 24bf1060a1
5 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
resources/inc/class.ui_resources.inc.php
View File

@ -179,12 +179,6 @@ class ui_resources
echo "<html><body><script>$js</script></body></html>\n"; echo "<html><body><script>$js</script></body></html>\n";
$GLOBALS['egw']->common->egw_exit(); $GLOBALS['egw']->common->egw_exit();
} }
elseif($content['cancel'])
{
$js .= 'window.close();';
echo "<html><body><script>$js</script></body></html>\n";
$GLOBALS['egw']->common->egw_exit();
}
} }
else else
{ {
@ -276,7 +270,7 @@ class ui_resources
$content['quantity'] = $content['quantity'] ? $content['quantity'] : 1; $content['quantity'] = $content['quantity'] ? $content['quantity'] : 1;
$content['useable'] = $content['useable'] ? $content['useable'] : 1; $content['useable'] = $content['useable'] ? $content['useable'] : 1;
$content['quantity'] = ($content['useable'] == $content['quantity']) ? $content['quantity'] : $content['quantity'].' ('.lang('useable ').$content['useable'].')'; $content['quantity'] = ($content['useable'] == $content['quantity']) ? $content['quantity'] : $content['quantity'].' ('.lang('useable').' '.$content['useable'].')';
//$sel_options['gen_src_list'] = $this->bo->get_genpicturelist(); //$sel_options['gen_src_list'] = $this->bo->get_genpicturelist();
@ -289,12 +283,19 @@ class ui_resources
$sel_options['cat_id'] = array($catofmaster => $sel_options['cat_id'][$catofmaster]); $sel_options['cat_id'] = array($catofmaster => $sel_options['cat_id'][$catofmaster]);
} }
*/ */
$content['description'] = $content['long_description'] ? $content['long_description'] : $content['short_description']; $content['description'] = chop($content['long_description']) ? $content['long_description'] : (chop($content['short_description']) ? $content['short_description'] : lang("no description available"));
$content['description'] = $content['description'] ? $content['description'] : lang('no description available'); $content['description'] = $content['description'] ? $content['description'] : lang('no description available');
$content['link_to'] = array(
'to_id' => $id,
'to_app' => 'resources'
);
$sel_options = array(); $sel_options = array();
$no_button = array(); $no_button = array(
'btn_buyable' => !$content['buyable'],
'btn_bookable' => !$content['bookable'],
'btn_edit' => !$this->bo->acl->is_permitted($content['cat_id'],EGW_ACL_EDIT)
);
$preserv = $content; $preserv = $content;
//print_r($content);
$this->tmpl->read('resources.showdetails'); $this->tmpl->read('resources.showdetails');
$this->tmpl->exec('resources.ui_resources.show',$content,$sel_options,$no_button,$preserv,2); $this->tmpl->exec('resources.ui_resources.show',$content,$sel_options,$no_button,$preserv,2);

10
resources/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

12
resources/setup/etemplates.old.inc.php
View File

File diff suppressed because one or more lines are too long

29
resources/setup/phpgw_de.lang
View File

@ -1,23 +1,26 @@
accessories of resources de Zubehör von accessories of resources de Zubehör von
accessories: resources de Zubehör:
actions resources de Aktionen actions resources de Aktionen
add accessory resources de Zubehör Hinzufügen add accessory resources de Zubehör Hinzufügen
add resources resources de Resource hinzufügen
administrator resources de Verwalter administrator resources de Verwalter
all categories resources de Alle Kategorien all categories resources de Alle Kategorien
book this resource resources de Buchen der Resource book this resource resources de Buchen der Resource
bookable resources de Bruchbar bookable resources de bruchbar
buy this resource resources de Kaufen der Resource buy this resource resources de Diese Resource kaufen
buyable resources de Kaufbar buyable resources de käuflich
categories admin resources de Verwalter der Kategorie categories admin resources de Verwalter der Kategorie
check all resources de Alle check all resources de Alle auswählen
choose categories admin resources de Wählen Sie einen Verwalter für diese Kategorie choose categories admin resources de Wählen Sie einen Verwalter für diese Kategorie
configure access permissions resources de Konfiguieren der Zugangseinstellungen clear selection resources de Ausgewählte löschen
configure access permissions resources de Zugangseinstellungen konfigurieren
create new accessory for this resource resources de Neues Zubehör zu dieser Resource hinzufügen create new accessory for this resource resources de Neues Zubehör zu dieser Resource hinzufügen
create new links resources de Neue Verknüpfung erstellen create new links resources de Neue Verknüpfung erstellen
delete this entry resources de Löschen des Eintrages delete this entry resources de Diesen Eintrag löschen
description (short) resources de Kurtzbeschreibung description (short) resources de Kurzbeschreibung
direct booking permissions resources de Erlaubnis direkt zu buchen direct booking permissions resources de Erlaubnis direkt zu buchen
don't use vfs (this will need a symlink --> see readme) resources de Vfs nicht benutzen. (Dies erfordert einen symlink --> siehe README) don't use vfs (this will need a symlink --> see readme) resources de Vfs nicht benutzen. (Dies erfordert einen symlink --> siehe README)
edit this entry resources de Bearbeiten des Eingrages edit this entry resources de Diesen Eintrag bearbeiten
existing links resources de Bestehende Verknüpfungen existing links resources de Bestehende Verknüpfungen
general resources de Generell general resources de Generell
general informations about resource resources de Generelle Informationen über diese Resource general informations about resource resources de Generelle Informationen über diese Resource
@ -29,9 +32,9 @@ how many of this resource exists resources de St
implies read permission resources de Impliziert Leseberechtigung implies read permission resources de Impliziert Leseberechtigung
informations about the location of resource resources de Informationen über den Lagerort der Resource informations about the location of resource resources de Informationen über den Lagerort der Resource
is resource bookable? resources de Ist diese Resource buchbar? is resource bookable? resources de Ist diese Resource buchbar?
is resource buyable? resources de Ist diese Resource kaüflich? is resource buyable? resources de Ist diese Resource käuflich?
is this resource bookable? resources de Ist diese Resource buchbar? is this resource bookable? resources de Ist diese Resource buchbar?
is this resource buyable? resources de Ist diese Resource kaüflich? is this resource buyable? resources de Ist diese Resource käuflich?
links resources de Verknüpfungen links resources de Verknüpfungen
location resources de Lagerort location resources de Lagerort
location of resource resources de Lagerort der Resource location of resource resources de Lagerort der Resource
@ -47,10 +50,12 @@ quantity resources de St
quantity of resource resources de Stückzahl der Resource quantity of resource resources de Stückzahl der Resource
quantity: resources de Stückzahl: quantity: resources de Stückzahl:
read permissions resources de Leseberechtigung read permissions resources de Leseberechtigung
related links resources de Siehe auch
resources resources de Resourcen resources resources de Resourcen
responsible: resources de Verantwortilich responsible: resources de Verantwortlich:
saves entry and exits resources de Speichern und Schließen saves entry and exits resources de Speichern und Schließen
select a category resources de Wählen sie eine Kategorie select a category resources de Wählen sie eine Kategorie
select resource resources de Resuource auswählen
short description resources de Kurzbeschreibung short description resources de Kurzbeschreibung
short description of resource resources de Kurzbeschreibung der Resouce short description of resource resources de Kurzbeschreibung der Resouce
something went wrong by deleting resource resources de Beim Löschen der Resource gab es ein Problem something went wrong by deleting resource resources de Beim Löschen der Resource gab es ein Problem
@ -60,7 +65,7 @@ the calendar of this resource resources de Kalender der Resource
use general resources icon resources de Benutze generelles icon use general resources icon resources de Benutze generelles icon
use own picture resources de Benutze ein eingenes Bild use own picture resources de Benutze ein eingenes Bild
use the category's icon resources de Benutze Bild der Kategorie use the category's icon resources de Benutze Bild der Kategorie
useable resources de Benutzbar useable resources de Nutzbar
view accessories for this resource resources de Zeige das Zubehör der Resource an view accessories for this resource resources de Zeige das Zubehör der Resource an
view this entry resources de Diesen Eintrag anschauen view this entry resources de Diesen Eintrag anschauen
web-page of resource resources de Ausführliche Beschreibung der Resource web-page of resource resources de Ausführliche Beschreibung der Resource

5
resources/setup/phpgw_en.lang
View File

@ -1,6 +1,8 @@
accessories of resources en accessories of accessories of resources en accessories of
accessories: resources en Accessories:
actions resources en Actions actions resources en Actions
add accessory resources en Add accessory add accessory resources en Add accessory
add resources resources en Add resources
administrator resources en Administrator administrator resources en Administrator
all categories resources en all categories all categories resources en all categories
book this resource resources en Book this resource book this resource resources en Book this resource
@ -10,6 +12,7 @@ buyable resources en Buyable
categories admin resources en Categories admin categories admin resources en Categories admin
check all resources en Check all check all resources en Check all
choose categories admin resources en choose categories admin choose categories admin resources en choose categories admin
clear selection resources en clear selection
configure access permissions resources en Configure Access Permissions configure access permissions resources en Configure Access Permissions
create new accessory for this resource resources en Create new accessory for this resource create new accessory for this resource resources en Create new accessory for this resource
create new links resources en Create new links create new links resources en Create new links
@ -47,10 +50,12 @@ quantity resources en Quantity
quantity of resource resources en Quantity of resource quantity of resource resources en Quantity of resource
quantity: resources en Quantity: quantity: resources en Quantity:
read permissions resources en Read permissions read permissions resources en Read permissions
related links resources en Related links
resources resources en resources resources resources en resources
responsible: resources en Responsible: responsible: resources en Responsible:
saves entry and exits resources en Saves entry and exits saves entry and exits resources en Saves entry and exits
select a category resources en Select a category select a category resources en Select a category
select resource resources en select resource
short description resources en Short description short description resources en Short description
short description of resource resources en Short description of resource short description of resource resources en Short description of resource
something went wrong by deleting resource resources en Something went wrong by deleting resource something went wrong by deleting resource resources en Something went wrong by deleting resource