diff --git a/etemplate/doc/referenz.html b/etemplate/doc/referenz.html
index f9164646f8..59dd5084b9 100644
--- a/etemplate/doc/referenz.html
+++ b/etemplate/doc/referenz.html
@@ -181,11 +181,15 @@ implement only a subset of XUL. Here are the main differences:
| no |
label |
- Displayed in front of each widget (if not empty) or the widget is replacing a '%s' in the label
- itself. Eg. '%s Name' to have the label Name behind a checkbox.
+ The label is displayed by default in front (for radiobuttons behind) each widget (if not empty).
+ If you want to specify a different position, use a '%s' in the label, which gets replaced by
+ the widget itself. Eg. '%s Name' to have the label Name behind a checkbox.
The label can contain variables, as descript for name.
If the label starts with a '@' it is replaced by the value of the content-array at this
- index (with the '@'-removed and after expanding the variables).
+ index (with the '@'-removed and after expanding the variables).
+ Note: The label gets always translated, if its longer than 1 char! If this is not
+ disired, use a label widget, place the not-to-translate label in the content-array
+ and check NoTranslation or set the xml attribute no_lang.
|
@@ -531,12 +535,16 @@ implement only a subset of XUL. Here are the main differences:
xml: type: can be set to get several predefined select-contents, in that case you dont need to set
the content as descripted above (if set it too its in front of the predefined rows):
select-cat: Select a phpgw category
- select-account: Select a user and/or group, determined by the options-field:
+ select-account: Select a user and/or group, determined by the options-field:
,{accounts(default)|groups|both},{0(only lid)|1(only names/default)|2(both)}
select-percent, select-priority, select-access, select-country, select-state: as you expect
by the name
select-year, select-month, select-day: options for year: ,start,end (start and end can be a number of
- years from now or if > 100 a absolut year)
+ years from now or if > 100 a absolut year)
+ select-number: Select a number out of a range specified by the options-field:
+ ,{start (default=1)},{end (incl., default=10)},{decrement (default=1)}
+ select-app: Select an application, availible options:
+ ,{''=user enabled(default)|installed|all)}
@@ -555,18 +563,28 @@ implement only a subset of XUL. Here are the main differences:
| Date |
- <date options="Y-m-d,1"/>
+ <date options="Y-m-d,1"/>
+ <date type="date-time"/>
+ <date type="date-timeonly" options="H:i"/>
|
no |
date |
- Dateinput via selectboxes or a field for the year
+ Date-/Time-input via selectboxes or a field for the year
The order of the input-fields is determined by the prefs of the user.
- Options: [date-storage-format][,year-no-selectbox]
- date-storage-format is the format, in which the date is stored in the variable: empty means
- an unix-timestamp, or a string containing the letters Y, m and d plus separators,
- eg. 'Y-m-d': 2002-12-31.
- year-no-selectbox if true an int-widget (input-field) is used instead of a select-year widget.
+ Options: [datetime-storage-format][,&1=year-no-selectbox|&2=today-button]
+ datetime-storage-format is the format, in which the date is stored in the variable:
+ empty means an unix-timestamp (in GMT), or a string containing the letters Y, m,
+ d, H, i plus separators, eg. 'Y-m-d': 2002-12-31. The storage format
+ for times is always 24h or timestamp with date 1.1.1970 (if no date used). (This has nothing
+ to do with the format of the display, which is only determined by the users preferences.)
+ year-no-selectbox if set (&1) an int-widget (input-field) is used instead of a
+ select-year widget.
+ today-button: if set (&2) a [Today] button is displayed which sets the fields to
+ the up-to-date date (via javascript)
+ Sub-widgets: date-time: a date and a time and date-timeonly: only a time
+ These widgets allow the input of times too or only, they use 12h am/pm or 24h format as
+ specified in the user prefs.
If readonly is set, this widget can be used to display a date, without the need to convert it.
|
diff --git a/etemplate/setup/phpgw_de.lang b/etemplate/setup/phpgw_de.lang
index 648f96dabb..27407d19e8 100644
--- a/etemplate/setup/phpgw_de.lang
+++ b/etemplate/setup/phpgw_de.lang
@@ -12,6 +12,7 @@ add table etemplate de Tabelle zuf
align etemplate de Ausrichtung
alignment of label and input-field in table-cell etemplate de Ausrichtung der Beschriftung und des Eingabefeldes in der Tabellenzelle
alignment of the v/hbox containing table-cell etemplate de Ausrichtung der die V/HBox enthaltenden Tabellenzelle
+am etemplate de Vormittag
an indexed column speeds up querys using that column (cost space on the disk !!!) etemplate de eine indizierte Spalte beschleunigt Anfragen die diese benutzen (kostet Plattenplatz !!!)
application etemplate de Anwendung
application name needed to write a langfile or dump the etemplates !!! etemplate de Name der Anwendung benötigt um eine Sprachdatei oder eTemplate-Distibutionsdate zu schreiben !!!
@@ -42,8 +43,12 @@ creates an english ('en') langfile from label and helptexts (for application in
css class for the table-tag etemplate de CSS class der Tabelle
css-class name for this row, preset: 'nmh' = nextmatch header, 'nmr' = alternating nm row, 'nmr0'+'nmr1' nm rows etemplate de Name der CSS class dieser Zeile, vorbelegt sind: 'th' = Kopfzeile, 'row' = zeilenweise wechselnde Farbe bzw. 'row_on', 'row_off'
css-styles etemplate de CSS Stile
+date+time etemplate de Datum+Uhrzeit
+datum etemplate de Datum
+day etemplate de Tag
db ensures that every row has a unique value in that column etemplate de die Datenbank stelt sicher das alle Zeilen einen einmaligen Wert in dieser Spalte haben
db-tools etemplate de DB-Tools
+deck etemplate de Deck (intern)
default etemplate de Vorgabe
delete etemplate de Löschen
delete all selected etemplates, without further inquiry etemplate de löscht ALLE ausgewählten eTemplates OHNE weitere Rückfrage
@@ -71,7 +76,6 @@ embeded css styles, eg. '.red { background: red; }' (note the '.' before the cla
enable javascript onchange submit etemplate de JavaScript absenden bei Änderung (onChange) aktivieren
enter '' for an empty default, nothing mean no default etemplate de '' für einen leeren Vorgabewert eingeben, nichts bedeutet keine Vorgabe
enter a search pattern etemplate de Suchmuster eingeben
-enter filename to upload and attach, use [browse... etemplate de Dateinamen zum Hochland oder Anhängen eingeben, [Browse ...] zum Suchen verwenden
enter filename to upload and attach, use [browse...] to search for it etemplate de Dateinamen zum Hochland oder Anhängen eingeben, [Browse ...] zum Suchen verwenden
enter the new version number here (> old_version), empty for no update-file etemplate de Neue Versionsnummer eingeben (größer als alte), leer wenn keine Update-Datei erzeugt werden soll
enter the new version number here (has to be > old_version) etemplate de Neue Versionsnummer eingeben (muss größer als die alte sein)
@@ -99,12 +103,12 @@ go to the next page of entries etemplate de gehe zur n
go to the previous page of entries etemplate de gehe zur vorherigen Seite
hbox etemplate de HBox
height etemplate de Höhe
-height of row (in % or pixel), disable row: [! = not etemplate de Höhe der Zeile (in % oder Pixel), Zeile ausschalten: [! = nicht]=[]: eg. '!@data' schaltet Zeile aus, wenn Inhalt von data leer ist
height of row (in % or pixel), disable row: [! = not][=] eg: '!@data' disable row if content of data is empty etemplate de Höhe der Zeile (in % oder Pixel), Zeile ausschalten: [! = nicht]=[]: eg. '!@data' schaltet Zeile aus, wenn Inhalt von data leer ist
height of the table in % or pixels for the table-tag and (optional) div etemplate de Höhe der Tabelle in % oder Punkten
height, disabled etemplate de Höhe, Deaktiviert
help etemplate de Hilfe
horizontal rule etemplate de Waagrechte Linie
+hour etemplate de Stunde
html etemplate de HTML
if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell etemplate de wenn eine Feld deaktiviert ist, wird eine leere Tabellenzelle angezeigt, zum (zeitweisen) Entfernen eines Feldes
image etemplate de Grafik
@@ -121,7 +125,6 @@ insert new row in front of first line etemplate de Neue Zeile vor dieser einf
integer etemplate de Ganzzahl
key etemplate de Schlüssel
label etemplate de Beschriftung
-label:[bold Array de Array
label:[bold][italic] text:[len][,max] numbers:[min][,[max][,len]] t.area:[rows][,cols] radiob.:value h.rule:[width] templ.:[indexincontent] select:[multiselect] date:[values: eg. 'y-m-d'] etemplate de Beschriftung:[bold][italic] Text:[len][,max] Zahlen:[min][,[max][,len]] mehrz.Text:[Zeilen][,Spalten] Radiok.:Wert Templ.:[IndexInContent] Auswahl:[mehrzeilig] Datum:[Format: zB. 'Y-m-d']
lang etemplate de Sprache
language-short (eg. 'en' for english) for language-dependent template ('' reads your pref. languages or the default, us 'default' to read the default template '') etemplate de Kürzel der Sprache (zb. 'en' für Englisch) für sprachabhänige Template ('' ließt die bevorzugte Sprache, benutze 'default' für das standard Template '')
@@ -132,11 +135,12 @@ link etemplate de Verkn
linklist etemplate de ListeVerknüpfungen
linkto etemplate de VerküpfungZu
load this template into the editor etemplate de lädt diese Template zum Bearbeiten
+minute etemplate de Minute
+month etemplate de Monat
name etemplate de Name
name of other table where column is a key from etemplate de Name der anderen Tabelle von der diese Spalte ein Schlüssel ist
name of phpgw-template set (e.g. verdilak): '' = default (will read pref. template, us 'default' to read default template '') etemplate de Name des phpGW layouts (zb. verdilak): '' = Standard (ließt das bevorzugte Layout, benutze 'default' um das standard Layout '' zu lesen)
name of table to add etemplate de Name der zuzufügenden Tabelle
-name of the etemplate, should be in form application.function[.subtemplate etemplate de Name des eTemplate, in der Form anwendung.funktion[.subTemplate]
name of the etemplate, should be in form application.function[.subtemplate] etemplate de Name des eTemplate, in der Form anwendung.funktion[.subTemplate]
need to be unique in the table and no reseved word from sql, best prefix all with a common 2-digit short for the app, eg. 'et_' etemplate de muss für die Tabelle einmalig sein und darf ein reserviertes Wort von SQL sein, am besten alle mit einem gemeinsammen Kürzel der Anwendung beginnen: zb. 'et_'
new search etemplate de Neue Suche
@@ -155,6 +159,7 @@ options etemplate de Optionen
overflow etemplate de Überbreite
padding etemplate de Innenabstand
please enter table-name first !!! etemplate de Bitte geben Sie zuerst einen Tabellennamen an !!!
+pm etemplate de Nachmittag
precision etemplate de Genauigkeit
primary key etemplate de Primary Key
primary key for the table, gets automaticaly indexed etemplate de Hauptindex (Primary Key) der Tabelle, wird automatisch indiziert
@@ -177,6 +182,7 @@ select access etemplate de Zugriff ausw
select account etemplate de Benutzer auswählen
select an app first !!! etemplate de Bitte wählen Sie zuerst ein Anwendung aus !!!
select an app to search in etemplate de Anwendung zum Durchsuchen auswählen
+select an application etemplate de Anwendung auswählen
select an application, (*) = uninstalled etemplate de Anwendung auswählen, (*) = nicht installiert
select an entry to link with etemplate de Eintrag zum Verküpfen auswählen
select an table of the application etemplate de Tabelle der Anwendung auswählen
@@ -186,6 +192,7 @@ select country etemplate de Land ausw
select day etemplate de Tag auswählen
select if content of field should not be translated (label gets always translated) etemplate de abhaken wenn Inhalt des Feldes nicht übersetzt werden soll (Beschriftung wird immer übersetzt)
select month etemplate de Monat auswählen
+select number etemplate de Zahl auswählen
select one ... etemplate de Eine auswählen ...
select percentage etemplate de Prozente auswählen
select priority etemplate de Priorität auswählen
@@ -213,6 +220,7 @@ template deleted etemplate de Template gel
template saved etemplate de Template gespeichert
text etemplate de Textfeld
textarea etemplate de mehrzeiliges Textfeld
+time etemplate de Uhrzeit
to start the db-tools etemplate de startet die DB-Tools
to start the etemplate editor etemplate de startet den eTemplate Editor
to start the search etemplate de startet die Suche
@@ -230,7 +238,6 @@ version-number, should be in the form: major.minor.revision.number (eg. 0.9.13.0
view this linked entry in its application etemplate de Zeige diesen Eintrag in seiner Anwendung an
what happens with overflowing content: visible (default), hidden, scroll, auto (browser decides) etemplate de was passiert mit überbreitem Inhalt: sichtbar (standard), versteckt, rollend, automatich (der Browser entscheidet)
width etemplate de Breite
-width of col (in % or pixel), disable col: [! = not etemplate de Breite der Spalte (in % oder Punkten), deaktiviert Spalten: [! = nicht][=] zB.: '!@data' deaktiviert Spalte wenn data leer ist
width of col (in % or pixel), disable col: [! = not][=] eg: '!@data' disable col if content of data is empty etemplate de Breite der Spalte (in % oder Punkten), deaktiviert Spalten: [! = nicht][=] zB.: '!@data' deaktiviert Spalte wenn data leer ist
width of the table in % or pixels for the table-tag and (optional) div etemplate de Breite der Tabelle in % oder Punkten
width, disabled etemplate de Breite, Deaktiviert
@@ -240,3 +247,4 @@ write tables etemplate de Tabelle Schreiben
writes a 'etemplates.inc.php' file (for application in name) in the setup-dir of the app etemplate de schreibt ein Distributionsfile 'etemplates.inc.php' (für die Anwendung in Name) in das setup Verzeichnis der Anwendung
xml-file to import etemplate de XML Datei zum Importieren
xslt template etemplate de XSLT Template
+year etemplate de Jahr
diff --git a/etemplate/setup/phpgw_en.lang b/etemplate/setup/phpgw_en.lang
index 77808ac3b1..93565c4dc3 100644
--- a/etemplate/setup/phpgw_en.lang
+++ b/etemplate/setup/phpgw_en.lang
@@ -5,7 +5,6 @@
%s notranslation etemplate en %s NoTranslation
%s onchange etemplate en %s onChange
%s readonly etemplate en %s readonly
--1 etemplate en -1
a pattern to be searched for etemplate en a pattern to be searched for
add a new column (after the existing ones) etemplate en Add a new column (after the existing ones)
add column etemplate en Add Column
@@ -13,6 +12,7 @@ add table etemplate en Add Table
align etemplate en Align
alignment of label and input-field in table-cell etemplate en alignment of label and input-field in table-cell
alignment of the v/hbox containing table-cell etemplate en Alignment of the V/HBox containing table-cell
+am etemplate en am
an indexed column speeds up querys using that column (cost space on the disk !!!) etemplate en an indexed column speeds up querys using that column (cost space on the disk !!!)
application etemplate en Application
application name needed to write a langfile or dump the etemplates !!! etemplate en Application name needed to write a langfile or dump the eTemplates !!!
@@ -43,8 +43,12 @@ creates an english ('en') langfile from label and helptexts (for application in
css class for the table-tag etemplate en CSS class for the table-tag
css-class name for this row, preset: 'nmh' = nextmatch header, 'nmr' = alternating nm row, 'nmr0'+'nmr1' nm rows etemplate en CSS-class name for this row, preset: 'nmh' = NextMatch header, 'nmr' = alternating NM row, 'nmr0'+'nmr1' NM rows
css-styles etemplate en CSS-styles
+date+time etemplate en Date+Time
+datum etemplate en Datum
+day etemplate en Day
db ensures that every row has a unique value in that column etemplate en DB ensures that every row has a unique value in that column
db-tools etemplate en DB-Tools
+deck etemplate en Deck (internal)
default etemplate en Default
delete etemplate en Delete
delete all selected etemplates, without further inquiry etemplate en delete ALL selected eTemplates, WITHOUT further inquiry
@@ -104,6 +108,7 @@ height of the table in % or pixels for the table-tag and (optional) div etemplat
height, disabled etemplate en Height, Disabled
help etemplate en Help
horizontal rule etemplate en Horizontal Rule
+hour etemplate en Hour
html etemplate en Html
if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell etemplate en if field is disabled an empty table-cell is displayed, for (temporal) removement of a field/cell
image etemplate en Image
@@ -130,6 +135,8 @@ link etemplate en Link
linklist etemplate en LinkList
linkto etemplate en LinkTo
load this template into the editor etemplate en load this template into the editor
+minute etemplate en Minute
+month etemplate en Month
name etemplate en Name
name of other table where column is a key from etemplate en name of other table where column is a key from
name of phpgw-template set (e.g. verdilak): '' = default (will read pref. template, us 'default' to read default template '') etemplate en name of phpgw-template set (e.g. verdilak): '' = default (will read pref. template, us 'default' to read default template '')
@@ -140,7 +147,6 @@ new search etemplate en New search
new table created etemplate en New table created
newer version '%s' exists !!! etemplate en newer version '%s' exists !!!
nextmatch etemplate en Nextmatch
-no etemplate en No
no filename given or selected via browse... etemplate en no filename given or selected via Browse...
nothing found - try again !!! etemplate en Nothing found - try again !!!
nullable etemplate en Nullable
@@ -153,6 +159,7 @@ options etemplate en Options
overflow etemplate en Overflow
padding etemplate en Padding
please enter table-name first !!! etemplate en Please enter table-name first !!!
+pm etemplate en pm
precision etemplate en Precision
primary key etemplate en Primary Key
primary key for the table, gets automaticaly indexed etemplate en Primary key for the table, gets automaticaly indexed
@@ -185,6 +192,7 @@ select country etemplate en Select Country
select day etemplate en Select Day
select if content of field should not be translated (label gets always translated) etemplate en select if content of field should not be translated (label gets always translated)
select month etemplate en Select Month
+select number etemplate en Select Number
select one ... etemplate en Select One ...
select percentage etemplate en Select Percentage
select priority etemplate en Select Priority
@@ -212,6 +220,7 @@ template deleted etemplate en Template deleted
template saved etemplate en Template saved
text etemplate en Text
textarea etemplate en Textarea
+time etemplate en Time
to start the db-tools etemplate en to start the DB-Tools
to start the etemplate editor etemplate en to start the eTemplate editor
to start the search etemplate en to start the search
@@ -238,4 +247,4 @@ write tables etemplate en Write Tables
writes a 'etemplates.inc.php' file (for application in name) in the setup-dir of the app etemplate en writes a 'etemplates.inc.php' file (for application in Name) in the setup-dir of the app
xml-file to import etemplate en xml-file to import
xslt template etemplate en XSLT Template
-yes etemplate en Yes
+year etemplate en Year