commit 1808a5d27eef60ac71170d84dc2cd0149928186e
parent 93df4251c2ffde15a5770881c71ab99bbab809ca
Author: dankert <devnull@localhost>
Date: Mon, 24 Jan 2011 22:40:03 +0100
Umstellung der Eingabemasken auf tabellenloses Layout...
Diffstat:
9 files changed, 358 insertions(+), 389 deletions(-)
diff --git a/themes/default/templates/file/prop.tpl.src.php b/themes/default/templates/file/prop.tpl.src.php
@@ -1,117 +1,110 @@
page
form
- window icon:folder widths:40%,60% width:70%
- row
- cell
- text text:global_name
- cell class:name
+ window
+ fieldset
+ part
+ label for:name
+ text text:global_name
input name:name size:50 class:name
- row
- cell
- text text:global_filename
- cell class:filename
+ part
+ label for:filename
+ text text:global_filename
input name:filename class:filename
- row
- cell
- text text:file_extension
- cell class:filename
+ part
+ label for:extension
+ text text:file_extension
input name:extension size:10 class:extension
-
- row
- cell
- text text:global_description
- cell
+
+ part
+ label for:description
+ text text:global_description
inputarea name:description class:description
- row
- cell
- cell
- link action:folder subaction:select id:var:parentid var1:obj{objectid} value1:1 var2:type value2:copy
- text key:COPY
- text raw:,_
- link action:folder subaction:select id:var:parentid var1:obj{objectid} value1:1 var2:type value2:move
- text key:MOVE
- text raw:,_
- link action:folder subaction:select id:var:parentid var1:obj{objectid} value1:1 var2:type value2:link
- text key:LINK
- text raw:,_
- link action:folder subaction:select id:var:parentid var1:obj{objectid} value1:1 var2:type value2:delete
- text key:DELETE
- row
- cell colspan:2
- if false:mode:edit
- fieldset title:message:additional_info
- part
- label for:full_filename
- text text:global_full_filename
- text var:full_filename
-
- part
- label for:size
- text text:FILE_SIZE
- text var:size
+
+ if false:mode:edit
+ link class:action action:folder subaction:select id:var:parentid var1:obj{objectid} value1:1 var2:type value2:copy
+ text key:COPY
+ link class:action action:folder subaction:select id:var:parentid var1:obj{objectid} value1:1 var2:type value2:move
+ text key:MOVE
+ link class:action action:folder subaction:select id:var:parentid var1:obj{objectid} value1:1 var2:type value2:link
+ text key:LINK
+ link class:action action:folder subaction:select id:var:parentid var1:obj{objectid} value1:1 var2:type value2:delete
+ text key:DELETE
+ newline
+ newline
+ newline
+
+ fieldset title:message:additional_info
+ part
+ label for:full_filename
+ text text:global_full_filename
+ text var:full_filename
+
+ part
+ label for:size
+ text text:FILE_SIZE
+ text var:size
+
+ part
+ label for:mimetype
+ text text:FILE_mimetype
+ text var:mimetype
+
+ link class:action action:file subaction:size
+ text key:menu_file_size
- part
- label for:mimetype
- text text:FILE_mimetype
- text var:mimetype
-
- link class:action action:file subaction:size
- text key:menu_file_size
-
- part
- text text:message:id
- text var:objectid
-
- if present:cache_filename
- part
- text text:CACHE_FILENAME
- text var:cache_filename
- image icon:el_date
- date date:var:cache_filemtime
-
- part
- label for:pages
- text text:FILE_PAGES
- table
- list list:pages extract:true
- row
- cell
- link url:var:url target:cms_main
- image type:page
- text var:name
- if empty:pages
- text text:GLOBAL_NOT_FOUND
- fieldset title:message:prop_userinfo
+ part
+ text text:message:id
+ text var:objectid
+
+ if present:cache_filename
part
- text text:global_created
+ label for:cache_filename
+ text text:CACHE_FILENAME
+ text var:cache_filename
image icon:el_date
- date date:var:create_date
- image icon:user
- user user:var:create_user
+ date date:var:cache_filemtime
- part
- text text:global_lastchange
- image icon:el_date
- date date:var:lastchange_date
- image icon:user
- user user:var:lastchange_user
+ part
+ label for:pages
+ text text:FILE_PAGES
+ table
+ list list:pages extract:true
+ row
+ cell
+ link url:var:url target:cms_main
+ image type:page
+ text var:name
+ if empty:pages
+ text text:GLOBAL_NOT_FOUND
+
+ fieldset title:message:prop_userinfo
+ part
+ text text:global_created
+ image icon:el_date
+ date date:var:create_date
+ image icon:user
+ user user:var:create_user
+
+ part
+ text text:global_lastchange
+ image icon:el_date
+ date date:var:lastchange_date
+ image icon:user
+ user user:var:lastchange_user
- row
- cell colspan:2
- link class:action action:file subaction:compress
- image file:icon/compress
- text key:menu_file_compress
- link class:action action:file subaction:uncompress
- image file:icon/uncompress
- text key:menu_file_uncompress
- link class:action action:file subaction:extract
- image file:icon/extract
- text key:menu_file_extract
- row
- cell colspan:2 class:act
- button type:ok
+ link class:action action:file subaction:compress
+ image file:icon/compress
+ text key:menu_file_compress
+ link class:action action:file subaction:uncompress
+ image file:icon/uncompress
+ text key:menu_file_uncompress
+ link class:action action:file subaction:extract
+ image file:icon/extract
+ text key:menu_file_extract
+
+ button type:ok
focus field:name
\ No newline at end of file
diff --git a/themes/default/templates/folder/prop.tpl.src.php b/themes/default/templates/folder/prop.tpl.src.php
@@ -18,32 +18,33 @@ page
text text:global_description
inputarea name:description class:description
- fieldset title:message:additional_info
- if false:mode:edit
- label for:full_filename
- text key:FULL_FILENAME
- text var:full_filename
- newline
- label for:objectid
- text key:id
- text var:objectid
-
- fieldset title:message:PROP_USERINFO
- part
- label for:create_user
- text text:global_created
- image icon:el_date
- date date:var:create_date
- image icon:user
- user user:var:create_user
-
- part
- label for:lastchange_user
- text text:global_lastchange
- image icon:el_date
- date date:var:lastchange_date
- image icon:user
- user user:var:lastchange_user
+ if false:mode:edit
+ fieldset title:message:additional_info
+ if false:mode:edit
+ label for:full_filename
+ text key:FULL_FILENAME
+ text var:full_filename
+ newline
+ label for:objectid
+ text key:id
+ text var:objectid
+
+ fieldset title:message:PROP_USERINFO
+ part
+ label for:create_user
+ text text:global_created
+ image icon:el_date
+ date date:var:create_date
+ image icon:user
+ user user:var:create_user
+
+ part
+ label for:lastchange_user
+ text text:global_lastchange
+ image icon:el_date
+ date date:var:lastchange_date
+ image icon:user
+ user user:var:lastchange_user
button type:ok
diff --git a/themes/default/templates/link/edit.tpl.src.php b/themes/default/templates/link/edit.tpl.src.php
@@ -1,26 +1,19 @@
page
form
- window name:GLOBAL_PROP title:global_link icon:link width:90% widths:5%,30%,65%
+ window
+ fieldset
- row
- cell
+ part
radio name:type value:url
- cell
label for:type_url
text text:link_url
- cell
input name:url
- row
- cell
+ part
radio name:type value:link
- cell
label for:type_link
text text:link_target
- cell
selectbox list:objects name:targetobjectid
- row
- cell colspan:3 class:act
- button type:ok
+ button type:ok
focus field:name
diff --git a/themes/default/templates/link/prop.tpl.src.php b/themes/default/templates/link/prop.tpl.src.php
@@ -1,44 +1,42 @@
page
form
- window name:GLOBAL_PROP title:global_link icon:link width:70% widths:40%,60%
-
- row
- cell
- text text:GLOBAL_name
- cell class:name
+ window
+
+ fieldset title:message:global_prop
+
+ part
+ label for:name
+ text text:GLOBAL_name
input name:name class:name
- row
- cell
- text text:GLOBAL_description
- cell
+
+ part
+ label for:description
+ text text:GLOBAL_description
inputarea name:description class:description
- row
- cell colspan:2
- fieldset title:message:additional_info
- part
- label for:objectid
- text key:id
- text var:objectid
-
- fieldset title:message:prop_userinfo
- part
- label for:
- text text:global_created
- image icon:el_date
- date date:var:create_date
- image icon:user
- user user:var:create_user
- part
- label for:
- text text:global_lastchange
- image icon:el_date
- date date:var:lastchange_date
- image icon:user
- user user:var:lastchange_user
+ if not:mode:edit
+ fieldset title:message:additional_info
+ part
+ label for:objectid
+ text key:id
+ text var:objectid
+
+ fieldset title:message:prop_userinfo
+ part
+ label for:
+ text text:global_created
+ image icon:el_date
+ date date:var:create_date
+ image icon:user
+ user user:var:create_user
+ part
+ label for:
+ text text:global_lastchange
+ image icon:el_date
+ date date:var:lastchange_date
+ image icon:user
+ user user:var:lastchange_user
- row
- cell colspan:2 class:act
- button type:ok
+ button type:ok
focus field:name
diff --git a/themes/default/templates/page/el.tpl.src.php b/themes/default/templates/page/el.tpl.src.php
@@ -1,41 +1,41 @@
page
window name:x title:TEMPLATE_ELEMENTS widths:30%,50%,20%
- if not: empty:el
- row class:headline
- cell class:help
- text text:PAGE_ELEMENT_NAME
- cell class:help
- text text:PAGE_ELEMENT_VALUE
- cell class:help
- text text:GLOBAL_ARCHIVE
- if empty:el
+ table
+ if not: empty:el
+ row class:headline
+ cell class:help
+ text text:PAGE_ELEMENT_NAME
+ cell class:help
+ text text:PAGE_ELEMENT_VALUE
+ cell class:help
+ text text:GLOBAL_ARCHIVE
+ if empty:el
+ row
+ cell
+ text text:GLOBAL_NOT_FOUND
+ list list:el extract:true
+ row class:data
+ cell
+ link url:var:url title:var:desc
+ image elementtype:var:type align:left
+ text var:name
+ cell
+ text var:value
+ text raw:_
+ cell
+ if present:archive_url
+ link url:var:archive_url title:message:GLOBAL_ARCHIVE_DESC
+ text text:GLOBAL_ARCHIVE
+ text raw:_(_
+ text var:archive_count
+ text raw:_)
+ else
+ text text:GLOBAL_NO_ARCHIVE type:emphatic title:message:GLOBAL_NO_ARCHIVE_DESC
+ set var:archive_url
row
- cell
- text text:GLOBAL_NOT_FOUND
- list list:el extract:true
- row class:data
- cell
- link url:var:url title:var:desc
- image elementtype:var:type align:left
- text var:name
- cell
- text var:value
- text raw:_
- cell
- if present:archive_url
- link url:var:archive_url title:message:GLOBAL_ARCHIVE_DESC
- text text:GLOBAL_ARCHIVE
- text raw:_(_
- text var:archive_count
- text raw:_)
- else
- text text:GLOBAL_NO_ARCHIVE type:emphatic title:message:GLOBAL_NO_ARCHIVE_DESC
- set var:archive_url
- row
- cell class:help colspan:3
- text text:PAGE_ELEMENTS_DESC
- row
- cell colspan:3
- link action:page subaction:form title:message:menu_page_form_desc class:action
- text key:menu_page_form
+ cell class:help colspan:3
+ text text:PAGE_ELEMENTS_DESC
+
+ link action:page subaction:form title:message:menu_page_form_desc class:action
+ text key:menu_page_form
diff --git a/themes/default/templates/page/form.tpl.src.php b/themes/default/templates/page/form.tpl.src.php
@@ -1,60 +1,52 @@
page
form
- window title:TEMPLATE_ELEMENTS name:TEMPLATE_ELEMENTS widths:30%,5%,65%
-
- if empty:el
- row
- cell colspan:4
- text text:GLOBAL_NOT_FOUND
- if not: empty:el
- row
- cell class:help
- text text:PAGE_ELEMENT_NAME
- cell class:help
- text text:GLOBAL_CHANGE
- cell class:help
- text text:GLOBAL_VALUE
-
- list list:el extract:true
- row class:data
- cell
- label for:var:saveid
- image elementtype:var:type
- text var:name
- cell
- checkbox name:var:saveid default:false readonly:false
- cell
- if value:var:type contains:text,date,number
- input index:true type:text name:var:id default:var:value size:40 maxlength:255 onchange:onchange
- if value:var:type equals:longtext
- inputarea index:true name:var:id rows:7 cols:50 onchange:onchange default:var:value
- if value:var:type contains:select,link,list
- selectbox name:var:id list:list default:var:value
+ window
+ table
+ if empty:el
+ row
+ cell colspan:4
+ text text:GLOBAL_NOT_FOUND
+ if not: empty:el
+ row
+ cell class:help
+ text text:PAGE_ELEMENT_NAME
+ cell class:help
+ text text:GLOBAL_CHANGE
+ cell class:help
+ text text:GLOBAL_VALUE
+
+ list list:el extract:true
+ row class:data
+ cell
+ label for:var:saveid
+ image elementtype:var:type
+ text var:name
+ cell
+ checkbox name:var:saveid default:false readonly:false
+ cell
+ if value:var:type contains:text,date,number
+ input index:true type:text name:var:id default:var:value size:40 maxlength:255 onchange:onchange
+ if value:var:type equals:longtext
+ inputarea index:true name:var:id rows:7 cols:50 onchange:onchange default:var:value
+ if value:var:type contains:select,link,list
+ selectbox name:var:id list:list default:var:value
- if present:release
- if present:publish
- row
- cell colspan:3
- fieldset title:message:options
+ fieldset title:message:options
if present:release
- row
- cell colspan:3
- checkbox name:release
- label for:release
- text raw:_
- text text:GLOBAL_RELEASE
+ part
+ checkbox name:release
+ label for:release
+ text raw:_
+ text text:GLOBAL_RELEASE
if present:publish
- row
- cell colspan:3
- checkbox name:publish
- label for:publish
- text raw:_
- text text:PAGE_PUBLISH_AFTER_SAVE
-
- row
- cell colspan:3 class:act
- button type:ok
+ part
+ checkbox name:publish
+ label for:publish
+ text raw:_
+ text text:PAGE_PUBLISH_AFTER_SAVE
+
+ button type:ok
\ No newline at end of file
diff --git a/themes/default/templates/page/prop.tpl.src.php b/themes/default/templates/page/prop.tpl.src.php
@@ -2,74 +2,69 @@ page
form
window
- row
- cell
+ fieldset
+ part
label for:name
text text:global_name
- cell class:name
input name:name size:50 class:name
- row
- cell
+
+ part
label for:filename
text text:global_filename
- cell class:filename
- input name:filename class:filename
- row
- cell
+ input name:filename class:filename
+
+ part
label for:description
text text:global_description
- cell
- inputarea name:description class:description
- row
- cell colspan:2
- fieldset title:message:additional_info
- part
- label for:full_filename
- text text:global_full_filename
- text var:full_filename class:filename
-
- part
- label for:template_name
- text text:global_template
- if present:template_url
- link url:var:template_url target:cms_main
- image icon:template
- text var:template_name
- if empty:template_url
- image file:icon_template
- text var:template_name
- newline
- if false:mode:edit
- link class:action action:page subaction:changetemplate
- image icon:template
- text key:menu_page_changetemplate
- part
- label for:mime_type
- text key:FILE_MIMETYPE
- text var:mime_type class:filename
-
- part
- label for:objectid
- text key:id
- text var:objectid
-
- fieldset title:message:prop_userinfo
- part
- label for:create_date
- text text:global_created
- image icon:el_date
- date date:var:create_date
- image icon:user
- user user:var:create_user
- part
- label for:lastchange_date
- text text:global_lastchange
- image icon:el_date
- date date:var:lastchange_date
- image icon:user
- user user:var:lastchange_user
- row
- cell colspan:2 class:act
- button type:ok
+ inputarea name:description class:description
+
+ fieldset title:message:additional_info
+ part
+ label for:full_filename
+ text text:global_full_filename
+ text var:full_filename class:filename
+
+ part
+ label for:template_name
+ text text:global_template
+ if present:template_url
+ link url:var:template_url target:cms_main
+ image icon:template
+ text var:template_name
+ if empty:template_url
+ image file:icon_template
+ text var:template_name
+ newline
+ if false:mode:edit
+ link class:action action:page subaction:changetemplate
+ image icon:template
+ text key:menu_page_changetemplate
+ part
+ label for:mime_type
+ text key:FILE_MIMETYPE
+ text var:mime_type class:filename
+
+ part
+ label for:objectid
+ text key:id
+ text var:objectid
+
+ fieldset title:message:prop_userinfo
+ part
+ label for:create_date
+ text text:global_created
+ image icon:el_date
+ date date:var:create_date
+ image icon:user
+ user user:var:create_user
+ part
+ label for:lastchange_date
+ text text:global_lastchange
+ image icon:el_date
+ date date:var:lastchange_date
+ image icon:user
+ user user:var:lastchange_user
+
+ button type:ok
focus field:name
\ No newline at end of file
diff --git a/themes/default/templates/page/pub.tpl.src.php b/themes/default/templates/page/pub.tpl.src.php
@@ -1,16 +1,12 @@
page
form
window
- row
- cell
- fieldset title:message:options
- row
- cell
+ fieldset title:message:options
+ part
checkbox name:files
label for:files
text text:global_files
newline
newline
- row
- cell class:act
- button type:ok-
\ No newline at end of file
+
+ button type:ok+
\ No newline at end of file
diff --git a/themes/default/templates/pageelement/archive.tpl.src.php b/themes/default/templates/pageelement/archive.tpl.src.php
@@ -1,63 +1,64 @@
page
form
window
- table widths:5%,5%,5%,15%,15%,35%,10%,10%
- row
- cell class:help
- text text:GLOBAL_NR
- cell class:help colspan:2
- if present:compareid
- text text:GLOBAL_COMPARE
- cell class:help
- text text:DATE
- cell class:help
- text text:GLOBAL_USER
- cell class:help
- text text:GLOBAL_VALUE
- cell class:help
- text text:GLOBAL_STATE
- cell class:help
- text text:GLOBAL_ACTION
-
- if empty:el
+ fieldset
+ table widths:5%,5%,5%,15%,15%,35%,10%,10%
row
- cell colspan:8
- text text:GLOBAL_NOT_FOUND
-
- list list:el extract:true
- row class:data
- cell
- text var:lfd_nr
- cell
- if present:compareid
- radio name:compareid value:var:id
- cell
+ cell class:help
+ text text:GLOBAL_NR
+ cell class:help colspan:2
if present:compareid
- radio name:withid value:var:id
- cell
- date date:var:date
- cell
- text var:user
- cell
- text var:value
- cell
- if true:var:public
- text key:GLOBAL_PUBLIC type:strong
- else
- if present:releaseUrl
- link url:var:releaseUrl title:message:GLOBAL_RELEASE_DESC
- text key:GLOBAL_RELEASE type:strong
- else
- text key:GLOBAL_INACTIVE type:emphatic
-
- cell
- if true:var:active
- text key:GLOBAL_ACTIVE type:emphatic
- else
- if present:useUrl
- link url:var:useUrl title:message:GLOBAL_USE_DESC
- text key:GLOBAL_USE
-
+ text text:GLOBAL_COMPARE
+ cell class:help
+ text text:DATE
+ cell class:help
+ text text:GLOBAL_USER
+ cell class:help
+ text text:GLOBAL_VALUE
+ cell class:help
+ text text:GLOBAL_STATE
+ cell class:help
+ text text:GLOBAL_ACTION
+
+ if empty:el
+ row
+ cell colspan:8
+ text text:GLOBAL_NOT_FOUND
+
+ list list:el extract:true
+ row class:data
+ cell
+ text var:lfd_nr
+ cell
+ if present:compareid
+ radio name:compareid value:var:id
+ cell
+ if present:compareid
+ radio name:withid value:var:id
+ cell
+ date date:var:date
+ cell
+ text var:user
+ cell
+ text var:value
+ cell
+ if true:var:public
+ text key:GLOBAL_PUBLIC type:strong
+ else
+ if present:releaseUrl
+ link url:var:releaseUrl title:message:GLOBAL_RELEASE_DESC
+ text key:GLOBAL_RELEASE type:strong
+ else
+ text key:GLOBAL_INACTIVE type:emphatic
+
+ cell
+ if true:var:active
+ text key:GLOBAL_ACTIVE type:emphatic
+ else
+ if present:useUrl
+ link url:var:useUrl title:message:GLOBAL_USE_DESC
+ text key:GLOBAL_USE
+
if present:compareid
row
cell colspan:8 class:act