diff --git a/admin/setup/setup.inc.php b/admin/setup/setup.inc.php index 49b3cabe31..c34e52babd 100755 --- a/admin/setup/setup.inc.php +++ b/admin/setup/setup.inc.php @@ -23,28 +23,11 @@ 'email' => 'phpgroupware-developers@gnu.org' ); - $setup_info['admin']['maintainer'][] = array + $setup_info['admin']['maintainer'][] = array ( - 'name' => 'Joseph Engo', - 'email' => 'jengo@phpgroupware.org' - ); - - $setup_info['admin']['maintainer'][] = array - ( - 'name' => 'Marc A. Peters', - 'email' => 'skeeter@phpgroupware.org' - ); - - $setup_info['admin']['maintainer'][] = array - ( - 'name' => 'Bettina Gille', - 'email' => 'ceb@phpgroupware.org' - ); - - $setup_info['admin']['maintainer'][] = array - ( - 'name' => 'Dan Kuykendall', - 'email' => 'seek3r@phpgroupware.org' + 'name' => 'phpGroupWare coreteam', + 'email' => 'phpgroupware-developers@gnu.org', + 'url' => 'www.phpgroupware.org/coredevelopers' ); $setup_info['admin']['license'] = 'GPL'; diff --git a/admin/templates/default/app_data.xsl b/admin/templates/default/app_data.xsl index 2565794b25..e70fafebdc 100644 --- a/admin/templates/default/app_data.xsl +++ b/admin/templates/default/app_data.xsl @@ -51,7 +51,7 @@ - + {$app_title} @@ -62,8 +62,8 @@ - -   + +   diff --git a/phpgwapi/templates/default/about.xsl b/phpgwapi/templates/default/about.xsl index 2843cf3cb2..117782f9fe 100644 --- a/phpgwapi/templates/default/about.xsl +++ b/phpgwapi/templates/default/about.xsl @@ -32,7 +32,26 @@ - +   + + + + + + + + + + + + + + + + + + +   @@ -112,7 +131,21 @@ - +
[] + + + + + + + + + + + + +
 []
  []
+
@@ -141,3 +174,26 @@ + + + + + + + +
+ + + + + + + + + + + + +
 []
  []
+
+ diff --git a/phpgwapi/templates/funkwerk/css/funkwerk.css b/phpgwapi/templates/funkwerk/css/funkwerk.css index 07494ac2ac..b68b0db9f0 100644 --- a/phpgwapi/templates/funkwerk/css/funkwerk.css +++ b/phpgwapi/templates/funkwerk/css/funkwerk.css @@ -8,6 +8,11 @@ body background-color: #CCCCCC; } +table.left_app +{ + border-color: #660000; +} + .top_top { background-color: #FF3300 @@ -33,7 +38,7 @@ td.left background-color: #0000A0; } -.user_info +.user_info,.date { background-color: #FF3300; color: #FFFFFF; diff --git a/phpgwapi/templates/funkwerk/css/mit.css b/phpgwapi/templates/funkwerk/css/mit.css index 884bbe2985..e9649a5e7d 100644 --- a/phpgwapi/templates/funkwerk/css/mit.css +++ b/phpgwapi/templates/funkwerk/css/mit.css @@ -8,6 +8,11 @@ body background-color: #CCCCCC; } +table.left_app +{ + border-color: #FFCCCC; +} + .top_top { background-color: #999999; @@ -33,7 +38,7 @@ td.left background-color: #990000; } -.user_info +.user_info,.date { background-color: #ADADAD; color: #FFFFFF; @@ -76,14 +81,14 @@ a:hover.left,a:link.left_selected,a:active.left_selected,a:visited.left_selected .login,.portal,.about { background-color: #ADADAD; - border-color: #000000; + border-color: #FF3300; } a.portal_text,.portal_text { color: #FFFFFF; text-decoration: none; - background-color: #000066; + background-color: #FF3300; } a:hover.portal_text diff --git a/phpgwapi/templates/funkwerk/css/mit2.css b/phpgwapi/templates/funkwerk/css/mit2.css new file mode 100644 index 0000000000..4e56d683d4 --- /dev/null +++ b/phpgwapi/templates/funkwerk/css/mit2.css @@ -0,0 +1,152 @@ +body,p,td,th,table,input,form,option +{ + color: #333333; +} + +body +{ + background-color: #CCCCCC; +} + +.top_top +{ + background-color: #999999; +} + +.top_bottom +{ + background-color: #FFCCCC; +} + +td.left +{ + background-color: #999999; +} + +.left_app +{ + background-color: #FF3300; +} + +.top_menu +{ + background-color: #FF3300; +} + +.user_info +{ + background-color: #FF3300; + color: #FFFFFF; +} + +.date +{ + background-color: #ADADAD; + color: #FFFFFF; +} + +.admin_info,a:link.admin_info,a:active.admin_info,a:visited.admin_info,a:hover.admin_info +{ + background-color: #999999; + color: #FFFFFF; +} + +.bottom +{ + color: #FFFFFF; + background-color: #999999; +} + +a:link,a:active,a:visited,a:hover +{ + color: #333333; +} + +a:link.bottom,a:active.bottom,a:visited.bottom,a:hover.bottom,a:link.top_menu,a:active.top_menu,a:visited.top_menu,a:link.left,a:active.left,a:visited.left +{ + color: #FFFFFF; +} + +a:hover.top_menu,a:link.top_menu_selected,a:active.top_menu_selected,a:visited.top_menu_selected,a:hover.top_menu_selected +{ + color: #990000; + background-color: #FFFFFF; +} + +a:hover.left,a:link.left_selected,a:active.left_selected,a:visited.left_selected,a:hover.left_selected +{ + color: #990000; + background-color: #FFFFFF; +} + +.login,.portal,.about +{ + background-color: #ADADAD; + border-color: #990000; +} + +table.left_app +{ + border-color: #990000; +} + +a.portal_text,.portal_text +{ + color: #FFFFFF; + text-decoration: none; + background-color: #990000; +} + +a:hover.portal_text +{ + text-decoration: underline; + color: #660000; + background-color: #FFFFFF; +} + + +.row_on,.app_header +{ + background-color: #ADADAD; +} + +.th_bright +{ + background-color: #FFFFFF; +} + +.msgbox +{ + background-color: #FFFFFF; +} + +.row_off +{ + background-color: #999999; +} + +.th +{ + background-color: #FFCCCC; +} + +.th_text +{ + color: #333333; +} + +.cal_today +{ + background-color: #ffffcc; +} + +.cal_dayview +{ + background-color: #C0C0C0; +} + +.email_folder +{ + background-color: #adadad; + color: #ffffff; +} diff --git a/phpgwapi/templates/funkwerk/css/phpgw.css b/phpgwapi/templates/funkwerk/css/phpgw.css index 1d9e5db3c9..e1fcf1d854 100644 --- a/phpgwapi/templates/funkwerk/css/phpgw.css +++ b/phpgwapi/templates/funkwerk/css/phpgw.css @@ -23,11 +23,40 @@ table border-width: 0; } +table.portal +{ + width: 100%; +} + +table.about +{ + width: 70%; +} + +table.login +{ + margin-top: 130px; + width: 40%; + text-align: center; +} + +table.left_app +{ + border-width: 1px; + border-style: solid; +} + td.alarm { color: #FF3300; } +td.left +{ + height: 30; + width: 131; +} + a:link,a:visited,a:active { text-decoration: none; @@ -69,35 +98,12 @@ a.th,a.th_text height: 30; } -td.left -{ - height: 30; - width: 131; -} - .bottom { width: 100%; height: 5%; } -table.portal -{ - width: 100%; -} - -table.about -{ - width: 70%; -} - -table.login -{ - margin-top: 130px; - width: 40%; - text-align: center; -} - .login,.portal,.about,.msgbox { border-width: 1px; diff --git a/phpgwapi/templates/funkwerk/css/werft.css b/phpgwapi/templates/funkwerk/css/werft.css index 7c1ae45f17..73e5158346 100644 --- a/phpgwapi/templates/funkwerk/css/werft.css +++ b/phpgwapi/templates/funkwerk/css/werft.css @@ -8,6 +8,11 @@ body background-color: #CCCCCC; } +table.left_app +{ + border-color: #000000; +} + .top_top { background-color: #0000A0; @@ -33,7 +38,7 @@ td.left background-color: #0000A0; } -.user_info +.user_info,.date { background-color: #0000A0; color: #FFFFFF; diff --git a/phpgwapi/templates/funkwerk/phpgw.xsl b/phpgwapi/templates/funkwerk/phpgw.xsl index 1247441b48..e39290e87e 100644 --- a/phpgwapi/templates/funkwerk/phpgw.xsl +++ b/phpgwapi/templates/funkwerk/phpgw.xsl @@ -78,7 +78,7 @@ - [] + []