diff --git a/setup/applications.php b/setup/applications.php index 605ad21b31..cfec719385 100644 --- a/setup/applications.php +++ b/setup/applications.php @@ -64,7 +64,7 @@ exit; } - $bgcolor = array('DDDDDD','EEEEEE'); + $bgcolor = array('#DDDDDD','#EEEEEE'); function parsedep($depends,$main=True) { diff --git a/setup/lang/phpgw_en.lang b/setup/lang/phpgw_en.lang index ec0e925689..d22e211395 100644 --- a/setup/lang/phpgw_en.lang +++ b/setup/lang/phpgw_en.lang @@ -153,6 +153,7 @@ requires upgrade setup en Requires upgrade resolve setup en Resolve select the default applications to which your users will have access setup en Select the default applications to which your users will have access select the desired action(s) from the available choices setup en Select the desired action(s) from the available choices +select to download file setup en Select to download file select which group(s) will be exported (group membership will be maintained) setup en Select which group(s) will be exported (group membership will be maintained) select which group(s) will be imported (group membership will be maintained) setup en Select which group(s) will be imported (group membership will be maintained) select which languages you would like to use setup en Select which languages you would like to use diff --git a/setup/sqltoarray.php b/setup/sqltoarray.php index 59b0020b16..bd980b1b38 100644 --- a/setup/sqltoarray.php +++ b/setup/sqltoarray.php @@ -251,6 +251,7 @@ $setup_tpl->set_var('lang_showall','Show all'); $setup_tpl->set_var('title','SQL to schema_proc array util'); $setup_tpl->set_var('lang_applist','Applications'); + $setup_tpl->set_var('select_to_download_file',lang('Select to download file')); $setup_tpl->pfp('out','appheader'); $d = dir(PHPGW_SERVER_ROOT); diff --git a/setup/templates/default/applications.tpl b/setup/templates/default/applications.tpl index bcbf73ed13..1c7a531f78 100644 --- a/setup/templates/default/applications.tpl +++ b/setup/templates/default/applications.tpl @@ -12,10 +12,10 @@
-
{appdata}
-
{actions}
+
{appdata}
+
{actions}
- + {app_info} {app_title} {app_currentver} @@ -34,10 +34,10 @@ {apptitle}  {currentver}  {version}  - {install} - {upgrade} + {install} + {upgrade} {resolution}  - {remove} + {remove} diff --git a/setup/templates/default/applist.tpl b/setup/templates/default/applist.tpl index 1ec0ba2207..562748fe87 100644 --- a/setup/templates/default/applist.tpl +++ b/setup/templates/default/applist.tpl @@ -10,7 +10,7 @@ - + @@ -18,7 +18,7 @@ - + @@ -34,7 +34,7 @@ - +
  Name Title
{appname}  {apptitle}  Select to download file{select_to_download_file}
diff --git a/setup/templates/default/config_post_script.tpl b/setup/templates/default/config_post_script.tpl index 6ca96edf62..af79cd3af1 100644 --- a/setup/templates/default/config_post_script.tpl +++ b/setup/templates/default/config_post_script.tpl @@ -1,10 +1,10 @@ - +   - + {more_configs} diff --git a/setup/templates/default/head.tpl b/setup/templates/default/head.tpl index 2f74762ba4..a3c8eb3428 100644 --- a/setup/templates/default/head.tpl +++ b/setup/templates/default/head.tpl @@ -16,14 +16,14 @@ phpGroupWare {lang_setup} III {page_title} - + - -
-  phpGroupWare version {pgw_ver} {lang_setup} III{configdomain} + +  phpGroupWare version {pgw_ver} {lang_setup} III{configdomain} + {logoutbutton}
diff --git a/setup/templates/default/lang_main.tpl b/setup/templates/default/lang_main.tpl index f516bcfabb..bf65bf173e 100644 --- a/setup/templates/default/lang_main.tpl +++ b/setup/templates/default/lang_main.tpl @@ -2,17 +2,17 @@

 

- + - + - +
-  {stage_title} +  {stage_title}
{stage_desc}
{select_box_desc}
diff --git a/setup/templates/default/ldap.tpl b/setup/templates/default/ldap.tpl index aa88611f38..3fccadb1ce 100644 --- a/setup/templates/default/ldap.tpl +++ b/setup/templates/default/ldap.tpl @@ -1,32 +1,32 @@ - - + + - +
 {ldapimport}
 {ldapimport}
 {description}
 
- - + + - + - + - + - + @@ -39,7 +39,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -65,7 +65,7 @@ - + + + diff --git a/setup/templates/default/schema.tpl b/setup/templates/default/schema.tpl index 44844140fc..994efa9e30 100644 --- a/setup/templates/default/schema.tpl +++ b/setup/templates/default/schema.tpl @@ -12,10 +12,10 @@ - - + + - + @@ -29,7 +29,7 @@ - + diff --git a/setup/templates/default/setup_db_blocks.tpl b/setup/templates/default/setup_db_blocks.tpl index 4a4535b400..da2c3e20d7 100644 --- a/setup/templates/default/setup_db_blocks.tpl +++ b/setup/templates/default/setup_db_blocks.tpl @@ -101,19 +101,19 @@ - diff --git a/setup/templates/default/setup_main.tpl b/setup/templates/default/setup_main.tpl index 63958f7e3e..b7ef93b72f 100644 --- a/setup/templates/default/setup_main.tpl +++ b/setup/templates/default/setup_main.tpl @@ -2,10 +2,10 @@
 {description}
 
 {description}
 
{lang_ldapmodify}
{lang_ldapimport}
{lang_ldapexport}
 {select_users}
 {select_admins}
 {select_groups}
 {select_apps}
 {note} @@ -79,7 +79,7 @@ -
@@ -88,7 +88,7 @@ -
{appdata}
{actions}
{appdata}
{actions}
{app_info} {app_title} {app_version}{appinfo}  {apptitle}  {install}{install}
- + - + - + @@ -121,12 +121,12 @@     - + - +
-  {subtitle} +  {subtitle}
{submsg}
-  {tblchange} +  {tblchange}
-  {status} +  {status}
{tableshave} {subaction}
diff --git a/setup/templates/default/setup_demo.tpl b/setup/templates/default/setup_demo.tpl index ce493c19bd..ec7ea85e96 100644 --- a/setup/templates/default/setup_demo.tpl +++ b/setup/templates/default/setup_demo.tpl @@ -4,7 +4,7 @@ 		{description}
{detailadmin}  + {detailadmin} 
- - @@ -15,10 +15,10 @@ - - @@ -39,10 +39,10 @@ - - @@ -57,10 +57,10 @@ - - diff --git a/setup/templates/default/sqltoarray.tpl b/setup/templates/default/sqltoarray.tpl index a886b8db9f..bc682b55a4 100644 --- a/setup/templates/default/sqltoarray.tpl +++ b/setup/templates/default/sqltoarray.tpl @@ -1,6 +1,6 @@
- {db_step_text} + + {db_step_text} +  
- {config_step_text} + + {config_step_text} +  
- {lang_step_text} + + {lang_step_text} +  
- {apps_step_text} + + {apps_step_text} +  
- + 
 	$phpgw_baseline = array(