diff --git a/phpgwapi/templates/justweb/footer.tpl b/phpgwapi/templates/justweb/footer.tpl
deleted file mode 100644
index a987f7abfe..0000000000
--- a/phpgwapi/templates/justweb/footer.tpl
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
- |
- |
-
-
-
-
-
-
-
-
- |
- |
- |
-
-
- |
-
-
- {user_info} |
-
-
diff --git a/phpgwapi/templates/justweb/head.inc.php b/phpgwapi/templates/justweb/head.inc.php
deleted file mode 100644
index e8267ec2c9..0000000000
--- a/phpgwapi/templates/justweb/head.inc.php
+++ /dev/null
@@ -1,55 +0,0 @@
-public_functions) && $GLOBALS[$class]->public_functions['css'])
- {
- $app_css = $GLOBALS[$class]->css();
- }
- }
-
- $bodyheader = 'BGCOLOR="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'"';
- if ($GLOBALS['phpgw_info']['server']['htmlcompliant'])
- {
- $bodyheader .= ' BGCOLOR="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'" ALINK="'.$GLOBALS['phpgw_info']['theme']['alink'].'" LINK="'.$GLOBALS['phpgw_info']['theme']['link'].'" VLINK="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"';
- }
-
- $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
- $tpl->set_unknowns('remove');
- $tpl->set_file(array('head' => 'head.tpl'));
-
- $var = Array
- (
- 'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
- 'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
- 'webserver_url' => $GLOBALS['phpgw_info']['server']['webserver_url'],
- 'home' => $GLOBALS['phpgw']->link('/index.php'),
- 'appt' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.day')),
- 'todo' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'todo.uitodo.add')),
- 'prefs' => $GLOBALS['phpgw']->link('/preferences/index.php'),
- 'email' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'email.uipreferences.preferences')),
- 'calendar' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uipreferences.preferences')),
- 'addressbook' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'addressbook.uiaddressbook.preferences')),
- 'charset' => lang('charset'),
- 'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
- 'website_title' => $GLOBALS['phpgw_info']['server']['site_title'],
- 'body_tags' => $bodyheader,
- 'app_css' => $app_css
- );
- $tpl->set_var($var);
- $tpl->pfp('out','head');
- unset($tpl);
-?>
diff --git a/phpgwapi/templates/justweb/head.tpl b/phpgwapi/templates/justweb/head.tpl
deleted file mode 100644
index 350551f361..0000000000
--- a/phpgwapi/templates/justweb/head.tpl
+++ /dev/null
@@ -1,80 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-{website_title}
-
-
-
-
-
-
diff --git a/phpgwapi/templates/justweb/images/tabs-bg0.gif b/phpgwapi/templates/justweb/images/tabs-bg0.gif
deleted file mode 100644
index 4a15b82ad0..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-bg0.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-bg0.png b/phpgwapi/templates/justweb/images/tabs-bg0.png
deleted file mode 100644
index df180846be..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-bg0.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-bg1.gif b/phpgwapi/templates/justweb/images/tabs-bg1.gif
deleted file mode 100644
index 05ca0c92de..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-bg1.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-bg1.png b/phpgwapi/templates/justweb/images/tabs-bg1.png
deleted file mode 100644
index fe16532d3d..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-bg1.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-end0.gif b/phpgwapi/templates/justweb/images/tabs-end0.gif
deleted file mode 100644
index 1f4cc71483..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-end0.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-end0.png b/phpgwapi/templates/justweb/images/tabs-end0.png
deleted file mode 100644
index fd98c8ef57..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-end0.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-end1.gif b/phpgwapi/templates/justweb/images/tabs-end1.gif
deleted file mode 100644
index 896bb2817a..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-end1.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-end1.png b/phpgwapi/templates/justweb/images/tabs-end1.png
deleted file mode 100644
index eb07a51db6..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-end1.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-ext.gif b/phpgwapi/templates/justweb/images/tabs-ext.gif
deleted file mode 100644
index dcc8490d96..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-ext.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-ext.png b/phpgwapi/templates/justweb/images/tabs-ext.png
deleted file mode 100644
index a79169ddc0..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-ext.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-l0.gif b/phpgwapi/templates/justweb/images/tabs-l0.gif
deleted file mode 100644
index 736f558afe..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-l0.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-l0.png b/phpgwapi/templates/justweb/images/tabs-l0.png
deleted file mode 100644
index 80ef977bc2..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-l0.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-l1.gif b/phpgwapi/templates/justweb/images/tabs-l1.gif
deleted file mode 100644
index 44043ec23f..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-l1.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-l1.png b/phpgwapi/templates/justweb/images/tabs-l1.png
deleted file mode 100644
index f00de3de3e..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-l1.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-r0.gif b/phpgwapi/templates/justweb/images/tabs-r0.gif
deleted file mode 100644
index 050a5ab987..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-r0.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-r0.png b/phpgwapi/templates/justweb/images/tabs-r0.png
deleted file mode 100644
index e9e6595091..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-r0.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-r1.gif b/phpgwapi/templates/justweb/images/tabs-r1.gif
deleted file mode 100644
index 9f16c2e1d6..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-r1.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-r1.png b/phpgwapi/templates/justweb/images/tabs-r1.png
deleted file mode 100644
index ba4480e295..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-r1.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-sepl.gif b/phpgwapi/templates/justweb/images/tabs-sepl.gif
deleted file mode 100644
index e9462064ae..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-sepl.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-sepl.png b/phpgwapi/templates/justweb/images/tabs-sepl.png
deleted file mode 100644
index 8906c79e25..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-sepl.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-sepm.gif b/phpgwapi/templates/justweb/images/tabs-sepm.gif
deleted file mode 100644
index 4088991bdf..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-sepm.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-sepm.png b/phpgwapi/templates/justweb/images/tabs-sepm.png
deleted file mode 100644
index 8230e2e982..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-sepm.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-sepr.gif b/phpgwapi/templates/justweb/images/tabs-sepr.gif
deleted file mode 100644
index 407351a32f..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-sepr.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-sepr.png b/phpgwapi/templates/justweb/images/tabs-sepr.png
deleted file mode 100644
index 6930f5bb79..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-sepr.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-start0.gif b/phpgwapi/templates/justweb/images/tabs-start0.gif
deleted file mode 100644
index 6cdb2b8b8c..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-start0.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-start0.png b/phpgwapi/templates/justweb/images/tabs-start0.png
deleted file mode 100644
index 94f946c4df..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-start0.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-start1.gif b/phpgwapi/templates/justweb/images/tabs-start1.gif
deleted file mode 100644
index bcd7a9d849..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-start1.gif and /dev/null differ
diff --git a/phpgwapi/templates/justweb/images/tabs-start1.png b/phpgwapi/templates/justweb/images/tabs-start1.png
deleted file mode 100644
index 4bc6fc5a12..0000000000
Binary files a/phpgwapi/templates/justweb/images/tabs-start1.png and /dev/null differ
diff --git a/phpgwapi/templates/justweb/login.tpl b/phpgwapi/templates/justweb/login.tpl
deleted file mode 100644
index 3e83f96053..0000000000
--- a/phpgwapi/templates/justweb/login.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
- {website_title} - Login
-
-
-
-
-
-{lang_message}
-
-
-
-
-
-
-
-
- {lang_phpgw_login}
- |
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
diff --git a/phpgwapi/templates/justweb/login_denylogin.tpl b/phpgwapi/templates/justweb/login_denylogin.tpl
deleted file mode 100644
index 378f3338c2..0000000000
--- a/phpgwapi/templates/justweb/login_denylogin.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
-
- Opps! You caught us in the middle of a system upgrade. Please, check back with us shortly.
- |
-
-
-
-
diff --git a/phpgwapi/templates/justweb/login_selectdomain.tpl b/phpgwapi/templates/justweb/login_selectdomain.tpl
deleted file mode 100644
index 6014da8656..0000000000
--- a/phpgwapi/templates/justweb/login_selectdomain.tpl
+++ /dev/null
@@ -1,63 +0,0 @@
-
-
-
- {website_title} - Login
-
-
-
-
-
-{lang_message}
-
-
-
-
-
-
-
-
- {lang_phpgw_login}
- |
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
diff --git a/phpgwapi/templates/justweb/navbar.inc.php b/phpgwapi/templates/justweb/navbar.inc.php
deleted file mode 100644
index 62ad11451e..0000000000
--- a/phpgwapi/templates/justweb/navbar.inc.php
+++ /dev/null
@@ -1,168 +0,0 @@
-set_file(
- array(
- 'navbar' => 'navbar.tpl'
- )
- );
-
- $var['img_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/justweb/images';
- $var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg'];
-
- if ($GLOBALS['phpgw_info']['flags']['navbar_target'])
- {
- $target = ' target="' . $GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
- }
-
- while ($app = each($GLOBALS['phpgw_info']['navbar']))
- {
- if ($app[1]['title'] != "Home" && $app[1]['title'] != 'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] != 'Logout')
- {
- $title = '';
- if ($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] == 'icons_and_text')
- {
- $title .= '
' . lang($app[1]['title']);
- }
- $applications .= '
' . $title . '';
- }
- }
- $var ['applications'] = $applications;
-
- $var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
- $var['preferences_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
- $var['logout_link'] = $GLOBALS['phpgw_info']['navbar']['logout']['url'];
- $var['help_link'] = $GLOBALS['phpgw_info']['navbar']['about']['url'];
-
- if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home')
- {
- $var['welcome_img'] = PHPGW_IMAGES_DIR . '/welcome-red.gif';
- }
- else
- {
- $var['welcome_img'] = PHPGW_IMAGES_DIR . '/welcome-grey.gif';
- }
-
- if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences')
- {
- $var['preferences_img'] = PHPGW_IMAGES_DIR . '/preferences-red.gif';
- }
- else
- {
- $var['preferences_img'] = PHPGW_IMAGES_DIR . '/preferences-grey.gif';
- }
-
- $var['logout_img'] = PHPGW_IMAGES_DIR . '/logout-grey.gif';
-
-/*
- if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'top')
- {
- $var['powered_by'] = lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
- }
- if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
- {
- $db = $GLOBALS['phpgw']->db;
- $db->query("select count(session_id) from phpgw_sessions");
- $db->next_record();
- $var['current_users'] = ' '
- . lang('Current users') . ': ' . $db->f(0) . '';
- }
-*/
- $now = time();
- $var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
- . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
- . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
-// . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
-// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
-
- /*
- * Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
- * to get rid of duplicate code.
- */
-
-/*
- if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
- {
- $api_messages = lang('You are required to change your password during your first login')
- . '
Click this image on the navbar: ';
- }
- elseif ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30))
- {
- $api_messages = lang('it has been more then x days since you changed your password',30);
- }
-
- // This is gonna change
- if (isset($cd))
- {
- $var['messages'] = $api_messages . "
" . checkcode($cd);
- }
-*/
- if (! function_exists('display_section'))
- {
-//echo 'function was not found
';
-/*
- function display_section($appname,$title,$file)
- {
- $GLOBALS['prefs'][$appname]['title'] = $title;
- $GLOBALS['prefs'][$appname]['file'][] = $file;
- }
- $temp_hooks = CreateObject('phpgwapi.hooks');
-
- $temp_hooks->process('preferences',array('preferences'));
-*/
-//echo 'prefs';
-//print_r($GLOBALS['prefs']);
-//echo '
';
-
-//echo 'phpgw_info';
-//print_r($GLOBALS['phpgw_info']);
-//echo '
';
- }
-// else {echo 'function was found
';}
-
-//$temp_browser = CreateObject('phpgwapi.browser');
-//echo 'agent: '.$temp_browser->get_agent().'
';
-
- $tpl->set_var($var);
- $tpl->pfp('out','navbar');
- return;
- }
-
- function parse_navbar_end()
- {
- $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
-
- $tpl->set_file(
- array(
- 'footer' => 'footer.tpl'
- )
- );
- $var = Array(
- 'img_root' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/justweb/images',
- 'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
- 'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
- 'user_info' => $GLOBALS['phpgw']->common->display_fullname() . ' - '
- . lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
- . lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
- . $GLOBALS['phpgw']->common->show_date(time(),'d, Y')
- );
- $tpl->set_var($var);
- $GLOBALS['phpgw']->hooks->process('navbar_end');
- echo $tpl->pfp('out','footer');
- }
diff --git a/phpgwapi/templates/justweb/navbar.tpl b/phpgwapi/templates/justweb/navbar.tpl
deleted file mode 100644
index 5f938185ad..0000000000
--- a/phpgwapi/templates/justweb/navbar.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
- |
-
-
-
-
-
- |
- |
- |
-
-
- |
-
-
-
-
-
- |
- |
-
-
- {applications} |
-
-
-
-
-
diff --git a/phpgwapi/templates/justweb/navbar_app.tpl b/phpgwapi/templates/justweb/navbar_app.tpl
deleted file mode 100644
index 6f639d7274..0000000000
--- a/phpgwapi/templates/justweb/navbar_app.tpl
+++ /dev/null
@@ -1 +0,0 @@
- | {value} |
| |