commit 18dd312333054953ca36935d4e38f74f0c1ee4c8 parent b35e7c04edb551c3512fdf75f1d0b18ca38b79ca Author: dankert <devnull@localhost> Date: Sun, 27 May 2007 22:59:49 +0200 Erg?nzung von Zwischen-?berschriften. Diffstat:
20 files changed, 222 insertions(+), 128 deletions(-)
diff --git a/themes/default/templates/file/edit.tpl.src.php b/themes/default/templates/file/edit.tpl.src.php @@ -4,4 +4,6 @@ page row cell upload name:file + row + cell class:act button type:ok diff --git a/themes/default/templates/file/size.tpl.src.php b/themes/default/templates/file/size.tpl.src.php @@ -3,39 +3,45 @@ page window row - cell class:fx + cell colspan:2 + fieldset title:message:IMAGE_NEW_SIZE + row + cell label for:factor text text:FILE_IMAGE_SIZE_FACTOR - cell class:fx + cell set var:factor value:1 selectbox name:factor list:factors row - cell class:fx + cell label for:width text text:FILE_IMAGE_NEW_WIDTH - cell class:fx + cell input name:width row - cell class:fx + cell label for:height text text:FILE_IMAGE_NEW_HEIGHT - cell class:fx + cell input name:height - + + row + cell colspan:2 + fieldset title:message:options row - cell class:fx + cell label for:format text text:FILE_IMAGE_FORMAT - cell class:fx + cell selectbox name:format list:formats row - cell class:fx + cell label for:jpeglist_compression text text:FILE_IMAGE_JPEG_COMPRESSION - cell class:fx + cell set var:jpeg_compression value:70 selectbox list:jpeglist name:jpeg_compression row diff --git a/themes/default/templates/folder/order.tpl.src.php b/themes/default/templates/folder/order.tpl.src.php @@ -5,6 +5,9 @@ page text text:GLOBAL_FOLDER_DESC row + cell class:help colspan:4 + link url:var:flip_url title:FOLDER_FLIP + text text:FOLDER_ORDER cell class:help link url:var:orderbytype_url title:FOLDER_ORDERBYTYPE text text:GLOBAL_TYPE @@ -14,17 +17,9 @@ page cell class:help link url:var:orderbylastchange_url title:FOLDER_ORDERBYLASTCHANGE text text:GLOBAL_LASTCHANGE - cell class:help colspan:4 - link url:var:flip_url title:FOLDER_FLIP - text text:FOLDER_ORDER list list:object extract:true row - cell width:40% class:fx - image type:var:icon - text var:name - cell width:18% class:fx - text var:date cell width:3% class:fx if present:upurl link url:var:upurl title:GLOBAL_UP @@ -53,3 +48,9 @@ page image file:var:bild if empty:downurl text raw:_ + cell width:40% class:fx + image type:var:icon + text var:name + cell width:18% class:fx + text var:date + + \ No newline at end of file diff --git a/themes/default/templates/folder/pub.tpl.src.php b/themes/default/templates/folder/pub.tpl.src.php @@ -2,7 +2,7 @@ page form window row - cell class:fx + cell if present:pages if present:subdirs checkbox name:pages @@ -18,7 +18,10 @@ page text text:global_files newline row - cell class:fx + cell + fieldset title:message:options + row + cell if present:subdirs checkbox name:subdirs label for:subdirs diff --git a/themes/default/templates/folder/select.tpl.src.php b/themes/default/templates/folder/select.tpl.src.php @@ -29,13 +29,13 @@ page image fileext:tree_none_end.gif align:left text raw:_ link url::javascript:mark(); - text text:message:FOLDER_MARK_ALL + text key:FOLDER_MARK_ALL text raw:_|_ link url::javascript:unmark(); - text text:message:FOLDER_UNMARK_ALL + text key:FOLDER_UNMARK_ALL text raw:_|_ link url::javascript:flip(); - text text:message:FOLDER_FLIP_MARK + text key:FOLDER_FLIP_MARK row cell class:fx colspan:2 diff --git a/themes/default/templates/folder/show.tpl.src.php b/themes/default/templates/folder/show.tpl.src.php @@ -22,7 +22,7 @@ page class:main cell class:fx link url:var:url target:cms_main title:desc image type:var:icon - text text:var:name + text var:name text raw:_ cell class:fx date date:var:date diff --git a/themes/default/templates/index/password.tpl.src.php b/themes/default/templates/index/password.tpl.src.php @@ -19,6 +19,6 @@ page row cell colspan:2 class:act - button type:ok + button type:ok text:button_next focus field:username diff --git a/themes/default/templates/index/projectmenu.tpl.src.php b/themes/default/templates/index/projectmenu.tpl.src.php @@ -1,5 +1,5 @@ page - window title:GLOBAL_PROJECTS name:login width:400 icon:project + window title:GLOBAL_PROJECTS name:login width:600 icon:project row cell class:logo colspan:2 @@ -7,18 +7,29 @@ page list list:projects extract:true row + cell colspan:3 + fieldset title:var:name + row cell link url:var:url title:message:TREE_CHOOSE_PROJECT set var:project value:project image type:project text var:name cell - list list:models key:model_id value:model_name - list list:languages key:language_id value:language_name - link action:index subaction:project id:var:id var1:languageid value1:var:language_id var2:modelid value2:var:model_id - text text:var:model_name - text raw:_-_ - text text:var:language_name - newline - newline +// list list:models key:model_id value:model_name +// list list:languages key:language_id value:language_name +// link action:index subaction:project id:var:id var1:languageid value1:var:language_id var2:modelid value2:var:model_id +// text text:var:model_name +// text raw:_-_ +// text text:var:language_name +// newline + form action:index subaction:project id:var:id + table widths:150px,150px + row + cell + radiobox list:models name:modelid default:var:defaultmodelid + cell + radiobox list:languages name:languageid default:var:defaultlanguageid + cell + button type:ok \ No newline at end of file diff --git a/themes/default/templates/index/register.tpl.src.php b/themes/default/templates/index/register.tpl.src.php @@ -14,6 +14,6 @@ page row cell colspan:2 class:act - button type:ok + button type:ok text:button_next focus field:mail diff --git a/themes/default/templates/index/showlogin.tpl.src.php b/themes/default/templates/index/showlogin.tpl.src.php @@ -37,37 +37,43 @@ page cell class:logo colspan:2 logo name:login row - cell class:fx width:50% + cell text key:USER_USERNAME - cell class:fx width:50% + cell if not:true present:force_username - input type:text name:login_name value: size:25 + input type:text name:login_name class:name value: size:20 else input type:hidden name:login_name value:var:force_username text value:var:force_username row - cell class:fx width:50% + cell text key:USER_PASSWORD - cell class:fx width:50% - password name:login_password default: size:25 + cell + password name:login_password class:name default: size:20 if true:property:mustChangePassword row - cell class:fx width:50% + cell colspan:2 + fieldset title:message:USER_NEW_PASSWORD + row + cell text key:USER_NEW_PASSWORD - cell class:fx width:50% + cell password name:password1 default: size:25 row - cell class:fx width:50% + cell text key:USER_NEW_PASSWORD_REPEAT - cell class:fx width:50% + cell password name:password2 default: size:25 row - cell class:fx width:50% - text key:GLOBAL_DATABASE - cell class:fx width:50% + row + cell colspan:2 + fieldset title:message:DATABASE + cell + text key:DATABASE + cell selectbox name:dbid list:dbids default:actdbid hidden name:screenwidth default:9999 #script diff --git a/themes/default/templates/object/aclform.tpl.src.php b/themes/default/templates/object/aclform.tpl.src.php @@ -3,17 +3,23 @@ page form window title:GLOBAL_ADD - + + row + cell colspan:3 + fieldset title:message:users + row cell class:fx - text text:GLOBAL_ALL + label for:type value:all + text text:GLOBAL_ALL cell class:fx radio name:type value:all default:true cell class:fx text raw:_ row cell class:fx - text text:GLOBAL_USER + label for:type value:user + text text:GLOBAL_USER cell class:fx radio name:type value:user cell class:fx @@ -21,31 +27,37 @@ page if present:groups row cell class:fx - text text:GLOBAL_GROUP + label for:type value:group + text text:GLOBAL_GROUP cell class:fx radio name:type value:group cell class:fx selectbox name:groupid list:groups + row - cell colspan:3 class:help - text raw:_ + cell colspan:3 + fieldset title:message:language row cell class:fx - text text:GLOBAL_LANGUAGE + label for:languageid + text text:GLOBAL_LANGUAGE cell class:fx text raw:_ cell class:fx selectbox name:languageid list:languages + row - cell colspan:3 class:help - text raw:_ + cell colspan:3 + fieldset title:message:acl list list:show value:t key:k row cell - text key:var:t prefix:acl_ + label for:var:t + text key:var:t prefix:acl_ cell width:20px - text key:var:t prefix:acl_ suffix:_abbrev + label for:var:t + text key:var:t prefix:acl_ suffix:_abbrev cell if value:var:t equals:read set var:var:t value:true diff --git a/themes/default/templates/pageelement/advanced.tpl.src.php b/themes/default/templates/pageelement/advanced.tpl.src.php @@ -128,7 +128,12 @@ page focus field:text - + if present:release + if present:publish + row + cell colspan:2 + fieldset title:options + if present:release row cell colspan:2 class:fx diff --git a/themes/default/templates/pageelement/edit.tpl.src.php b/themes/default/templates/pageelement/edit.tpl.src.php @@ -50,6 +50,12 @@ page focus field:text if present:release + if present:publish + row + cell colspan:2 + fieldset title:message:options + + if present:release row cell colspan:2 class:fx checkbox name:release diff --git a/themes/default/templates/pageelement/link.tpl.src.php b/themes/default/templates/pageelement/link.tpl.src.php @@ -10,6 +10,12 @@ page selectbox list:objects name:linkobjectid if present:release + if present:publish + row + cell colspan:2 + fieldset title:options + + if present:release row cell colspan:2 class:fx checkbox name:release diff --git a/themes/default/templates/profile/mail.tpl.src.php b/themes/default/templates/profile/mail.tpl.src.php @@ -5,12 +5,15 @@ page cell class:logo colspan:2 logo name:changemail row + cell colspan:2 + fieldset title:message:user_mail + row cell text text:user_new_mail cell input name:mail row - cell colspan:2 + cell colspan:2 class:act button type:ok - focus field:act_password- \ No newline at end of file + focus field:mail+ \ No newline at end of file diff --git a/themes/default/templates/profile/pwchange.tpl.src.php b/themes/default/templates/profile/pwchange.tpl.src.php @@ -5,13 +5,16 @@ page cell class:logo colspan:2 logo name:changepassword row + cell colspan:2 + fieldset title:message:user_act_password + row cell text text:user_password cell password name:act_password - newline - newline - newline + row + cell colspan:2 + fieldset title:message:user_new_password row cell text text:user_new_password @@ -23,7 +26,7 @@ page cell password name:password2 row - cell colspan:2 + cell colspan:2 class:act button type:ok focus field:act_password \ No newline at end of file diff --git a/themes/default/templates/project/edit.tpl.src.php b/themes/default/templates/project/edit.tpl.src.php @@ -4,44 +4,53 @@ page row cell text text:PROJECT_NAME - cell class:fx - input name:name size:50 + cell + input name:name size:30 class:name row cell text text:PROJECT_TARGET_DIR - cell class:fx - input class:filename name:target_dir size:50 - + cell + input class:filename name:target_dir size:50 class:filename + + row + cell + text text:PROJECT_CMD_AFTER_PUBLISH + cell + input name:cmd_after_publish class:filename size:50 + + row + cell colspan:2 + fieldset title:message:project_FTP row cell text text:PROJECT_FTP_URL - cell class:fx - input name:ftp_url + cell + input name:ftp_url class:filename size:50 row cell - text text:PROJECT_FTP_PASSIVE - cell class:fx - checkbox name:ftp_passive - - row cell - text text:PROJECT_CMD_AFTER_PUBLISH - cell class:fx - input name:cmd_after_publish + checkbox name:ftp_passive + label for:ftp_passive + text text:PROJECT_FTP_PASSIVE row - cell - text text:PROJECT_CONTENT_NEGOTIATION - cell class:fx + cell colspan:2 + fieldset title:message:options + row +// cell + cell colspan:2 checkbox name:content_negotiation + label for:content_negotiation + text text:PROJECT_CONTENT_NEGOTIATION row - cell - text text:PROJECT_CUT_INDEX - cell class:fx +// cell + cell colspan:2 checkbox name:cut_index + label for:cut_index + text text:PROJECT_CUT_INDEX row - cell colspan:2 + cell colspan:2 class:act button type:ok \ No newline at end of file diff --git a/themes/default/templates/search/prop.tpl.src.php b/themes/default/templates/search/prop.tpl.src.php @@ -1,6 +1,9 @@ page form window icon:search + row + cell colspan:2 + fieldset title:message:global_user row cell radio name:type value:create_user @@ -12,6 +15,9 @@ page text key:lastchange_user cell selectbox list:users name:userid default:var:act_userid + row + cell colspan:2 + fieldset title:message:MENU_SEARCH_PROP row cell radio name:type value:id @@ -33,6 +39,6 @@ page cell input name:text row class: - cell colspan:2 + cell colspan:2 class:act button type:ok focus field:name \ No newline at end of file diff --git a/themes/default/templates/user/edit.tpl.src.php b/themes/default/templates/user/edit.tpl.src.php @@ -2,46 +2,54 @@ page form window name:GLOBAL_USER widths:50%,50% row - cell class:fx + cell text text:user_username - cell class:fx - input name:name size:20 + cell + input name:name size:20 class:name row - cell class:fx + cell colspan:2 + fieldset title:message:ADDITIONAL_INFO + row + cell text text:user_fullname - cell class:fx - input name:fullname size: + cell + input name:fullname row - cell class:fx + cell text text:user_mail - cell class:fx - input name:mail size: + cell + input name:mail row - cell class:fx + cell text text:user_desc - cell class:fx - input name:desc size: + cell + input name:desc row - cell class:fx + cell text text:user_tel - cell class:fx - input name:tel size: + cell + input name:tel + row + cell colspan:2 + fieldset title:message:options + row +// cell colspan:2 + cell + cell + checkbox name:is_admin + label for:is_admin + text text:user_admin row - cell class:fx + cell text text:user_ldapdn - cell class:fx - input name:ldap_dn size: + cell + input name:ldap_dn size:50 row - cell class:fx + cell text text:user_style - cell class:fx + cell selectbox list:allstyles name:style default:config:interface/style/default row - cell class:fx - text text:user_admin - cell class:fx - checkbox name:is_admin - row cell colspan:2 class:act button type:ok focus field:name \ No newline at end of file diff --git a/themes/default/templates/user/pw.tpl.src.php b/themes/default/templates/user/pw.tpl.src.php @@ -2,35 +2,41 @@ page form window name:USER_PASSWORD columnclasses:fx rowclasses:rx row - cell class:fx + cell text text:user_username - cell class:fx + cell text var:name row - cell class:fx + cell colspan:2 + fieldset title:message:USER_new_password + row + cell text text:USER_new_password - cell class:fx + cell password name:password1 row - cell class:fx + cell text text:USER_new_password_repeat - cell class:fx + cell password name:password2 + row + cell colspan:2 + fieldset title:message:options if present:mail row - cell class:fx + cell text text:user_mail_new_password - cell class:fx + cell checkbox name:email row - cell class:fx + cell text text:user_random_password - cell class:fx + cell checkbox name:random row - cell class:fx + cell text text:user_password_timeout - cell class:fx + cell checkbox name:timeout row