touched up site management pages.

enhanced the site controller to handle wiki links.

codepot/src/codepot/controllers/site.php

@@ -7,9 +7,9 @@ class Site extends Controller
 	var $VIEW_HOME = 'site_home';
 	var $VIEW_EDIT = 'site_edit';
 	var $VIEW_DELETE = 'site_delete';
+        var $VIEW_CATALOG = 'site_catalog';
 	var $VIEW_LOG = 'log';
         var $VIEW_PROJECT_LIST = 'project_list';
-        var $VIEW_SITE_ADMINHOME = 'site_adminhome';
 
 	function Site ()
 	{
@@ -18,10 +18,12 @@ class Site extends Controller
 		$this->load->helper ('url');
 		$this->load->helper ('form');
 		$this->load->library ('Converter', 'converter');
+		$this->load->library ('WikiHelper', 'wikihelper');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
 		$this->load->library ('Language', 'lang');
 		$this->lang->load ('common', CODEPOT_LANG);
+		$this->lang->load ('site', CODEPOT_LANG);
 	}
 
 	function index ()
@@ -87,7 +89,7 @@ class Site extends Controller
 		$this->load->view ($this->VIEW_HOME, $data);
 	}
 
-	function adminhome ()
+	function catalog ()
 	{
 		$login = $this->login->getUser ();
 		if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '')
@@ -107,7 +109,7 @@ class Site extends Controller
 		{
 			$data['login'] = $login;
 			$data['sites'] = $sites;
-			$this->load->view ($this->VIEW_SITE_ADMINHOME, $data);
+			$this->load->view ($this->VIEW_CATALOG, $data);
 		}
 	}
 
@@ -298,15 +300,15 @@ class Site extends Controller
 					else 
 					{
 						// the site has been deleted successfully.
-						// go back to the site admin home.	
+						// go back to the site catalog page.	
-						redirect ('site/adminhome');
+						redirect ('site/catalog');
 					}
 				}
 				else 
 				{
 					// the confirm checkbox is not checked.
-					// go back to the site adminhome page.
+					// go back to the site catalog page.
-					redirect ('site/adminhome');
+					redirect ('site/catalog');
 				}
 			}
 			else
@@ -427,38 +429,28 @@ class Site extends Controller
 		}
 	}
 
-	function preference ()
+	function wiki ($xlink)
 	{
-		$login = $this->login->getUser();
+		$login = $this->login->getUser ();
-		if ($login['id'] == '') redirect ('main/signin');
+		if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '')
+			redirect ('main/signin');
 
-		$this->load->view (	
+		$data['login'] = $login;
-			$this->VIEW_ERROR, 
-			array (
-				'login' => $login,
-				'message' => 'USER PREFERENCE NOT SUPPORTED YET'
-			)
-		);
-	}
 
-	function admin ()
+		$linkname = $this->converter->HexToAscii ($xlink);
+
+		$link = $this->wikihelper->parseLink ($linkname, NULL, $this->converter);
+		if ($link === FALSE || $link === NULL)
 		{
-		$login = $this->login->getUser();
+			$data['message'] = "INVALID LINK - {$linkname}";
-		if ($login['id'] == '') redirect ('main/signin');
+			$this->load->view ($this->VIEW_ERROR, $data);
-
-		if ($login['sysadmin?'])
-		{
-			echo "...Site Administration...";
 		}
 		else
 		{
-			$this->load->view (	
+			if ($link->extra === NULL)
-				$this->VIEW_ERROR, 
+				redirect ("{$link->type}/{$link->target}/{$link->projectid}");
-				array (
+			else
-					'login' => $login,
+				redirect ("{$link->type}/{$link->target}/{$link->projectid}/{$link->extra}");
-					'message' => 'NO PERMISSION'
-				)
-			);
 		}
 	}
 

codepot/src/codepot/controllers/wiki.php

@@ -15,6 +15,7 @@ class Wiki extends Controller
 		$this->load->helper ('url');
 		$this->load->helper ('form');
 		$this->load->library ('Converter', 'converter');
+		$this->load->library ('WikiHelper', 'wikihelper');
 		$this->load->model (CODEPOT_LOGIN_MODEL, 'login');
 
 		$this->load->library ('Language', 'lang');
@@ -97,57 +98,21 @@ class Wiki extends Controller
 		}
 		else
 		{
-			if ($this->_is_reserved ($name, TRUE))
+			$link = $this->wikihelper->parseLink ($name, $projectid, $this->converter);
-			{
+			if ($link === FALSE)
-				$ex0 = $this->_trans_reserved ($name);
-				redirect ("{$ex0}/home/{$projectid}");
-			}
-			else
-			{
-				$ex = explode (':', $name);
-				$cnt = count($ex);
-				if ($cnt == 2)
-				{
-					if ($this->_is_reserved ($ex[0], TRUE))
-					{
-						$ex0 = $this->_trans_reserved ($ex[0]);
-						$ex1 = ($ex[1] == '')? $projectid: $ex[1];
-						redirect ("{$ex0}/home/{$ex1}");
-					}
-				}
-				else if ($cnt == 3)
-				{
-					if ($this->_is_reserved ($ex[0], TRUE) && 
-					    $ex[0] != '__PROJECT__' && $ex[0] != '__CODE__')
-					{
-						$ex0 = $this->_trans_reserved ($ex[0]);
-						$ex1 = ($ex[1] == '')? $projectid: $ex[1];
-						$ex2 = $this->converter->AsciiToHex ($ex[2]);
-						redirect ("{$ex0}/show/{$ex1}/{$ex2}");
-					}
-				}
-				else if ($cnt == 4)
-				{
-					if ($ex[0] == '__CODE__')
-					{
-						$ex0 = $this->_trans_reserved ($ex[0]);
-						$ex1 = ($ex[1] == '')? $projectid: $ex[1];
-						if ($ex[2] == 'file' || $ex[2] == 'history' || 
-						    $ex[2] == 'blame' || $ex[2] == 'diff')
-						{
-							$ex3 = $this->converter->AsciiToHex ($ex[3]);
-							redirect ("{$ex0}/{$ex[2]}/{$ex1}/{$ex3}");
-						}
-						else
 			{
 				$data['project'] = $project;
-							$data['message'] = 
+				$data['message'] = "INVALID LINK - {$name}";
-								"WRONG ACTION NAME FOR CODE - {$name}";
 				$this->load->view ($this->VIEW_ERROR, $data);
-
 				return;
 			}
-					}
+			else if ($link !== NULL)
+			{
+				if ($link->extra === NULL)
+					redirect ("{$link->type}/{$link->target}/{$link->projectid}");
+				else
+					redirect ("{$link->type}/{$link->target}/{$link->projectid}/{$link->extra}");
+				return;
 			}
 
 			$wiki = $this->wikis->get ($login['id'], $project, $name);
@@ -181,7 +146,6 @@ class Wiki extends Controller
 			}
 		}
 	}
-	}
 
 	function show ($projectid = '' , $name = '')
 	{
@@ -317,31 +281,6 @@ class Wiki extends Controller
 		}
 	}
 
-	function _trans_reserved ($name)
-	{
-		return substr (strtolower ($name), 2, strlen($name) -  4);
-	}
-
-	function _is_reserved ($name, $exact)
-	{
-		if ($exact)
-		{
-			return $name == '__PROJECT__' ||
-			       $name == '__WIKI__' ||
-			       $name == '__FILE__' ||
-			       $name == '__CODE__' ||
-			       $name == '__ISSUE__';
-		}
-		else
-		{
-			return substr ($name, 0, 11) == '__PROJECT__' ||
-			       substr ($name, 0, 8) == '__WIKI__' ||
-			       substr ($name, 0, 8) == '__FILE__' ||
-			       substr ($name, 0, 8) == '__CODE__' ||
-			       substr ($name, 0, 9) == '__ISSUE__';
-		}
-	}
-
 	function create ($projectid = '', $name = '')
 	{
 		return $this->_edit_wiki ($projectid, $name, 'create');

codepot/src/codepot/language/english/Makefile.am

@@ -2,7 +2,8 @@ wwwdir=$(WWWDIR)/codepot/language/english
 www_DATA =  \
 	common_lang.php \
 	issue_lang.php \
-	index.html
+	index.html \
+	site_lang.php
 
 EXTRA_DIST = $(www_DATA)
 

codepot/src/codepot/language/english/Makefile.in

@@ -165,7 +165,8 @@ wwwdir = $(WWWDIR)/codepot/language/english
 www_DATA = \
 	common_lang.php \
 	issue_lang.php \
-	index.html
+	index.html \
+	site_lang.php
 
 EXTRA_DIST = $(www_DATA)
 all: all-am

codepot/src/codepot/language/english/common_lang.php

@@ -57,6 +57,8 @@ $lang['Revision'] = 'Revision';
 $lang['Search'] = 'Search';
 $lang['Sign in'] = 'Sign in';
 $lang['Sign out'] = 'Sign out';
+$lang['Site'] = 'Site';
+$lang['Sites'] = 'Sites';
 $lang['Size'] = 'Size';
 $lang['Source'] = 'Source';
 $lang['Status'] = 'Status';

codepot/src/codepot/language/english/site_lang.php

@@ -0,0 +1,2 @@
+<?php
+?>

codepot/src/codepot/language/indonesian/common_lang.php

@@ -57,6 +57,8 @@ $lang['Revision'] = 'Revisi';
 $lang['Search'] = 'Search';
 $lang['Sign in'] = 'Masuk';
 $lang['Sign out'] = 'Keluar';
+$lang['Site'] = 'Site';
+$lang['Sites'] = 'Sites';
 $lang['Size'] = 'Ukuran';
 $lang['Source'] = 'Sumber';
 $lang['Status'] = 'Status';

codepot/src/codepot/language/korean/Makefile.am

@@ -2,7 +2,8 @@ wwwdir=$(WWWDIR)/codepot/language/korean
 www_DATA =  \
 	common_lang.php \
 	issue_lang.php \
-	index.html
+	index.html \
+	site_lang.php 
 
 EXTRA_DIST = $(www_DATA)
 

codepot/src/codepot/language/korean/Makefile.in

@@ -165,7 +165,8 @@ wwwdir = $(WWWDIR)/codepot/language/korean
 www_DATA = \
 	common_lang.php \
 	issue_lang.php \
-	index.html
+	index.html \
+	site_lang.php 
 
 EXTRA_DIST = $(www_DATA)
 all: all-am

codepot/src/codepot/language/korean/common_lang.php

@@ -57,6 +57,8 @@ $lang['Revision'] = '리비전';
 $lang['Search'] = '찾기';
 $lang['Sign in'] = '로그인';
 $lang['Sign out'] = '로그아웃';
+$lang['Site'] = '사이트';
+$lang['Sites'] = '사이트';
 $lang['Size'] = '크기';
 $lang['Status'] = '상태';
 $lang['Source'] = '소스';

codepot/src/codepot/language/korean/site_lang.php

@@ -0,0 +1,2 @@
+<?php
+?>

codepot/src/codepot/libraries/Makefile.am

@@ -2,7 +2,8 @@ wwwdir=$(WWWDIR)/codepot/libraries
 www_DATA =  \
 	converter.php \
 	index.html \
-	Lang_detect.php
+	Lang_detect.php \
+	wikihelper.php 
 
 EXTRA_DIST = $(www_DATA)
 

codepot/src/codepot/libraries/Makefile.in

@@ -165,7 +165,8 @@ wwwdir = $(WWWDIR)/codepot/libraries
 www_DATA = \
 	converter.php \
 	index.html \
-	Lang_detect.php
+	Lang_detect.php \
+	wikihelper.php 
 
 EXTRA_DIST = $(www_DATA)
 all: all-am

codepot/src/codepot/libraries/wikihelper.php

@@ -0,0 +1,117 @@
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed'); 
+ 
+class WikiHelper
+{
+	function WikiHelper ()
+	{
+	}
+
+	function parseLink ($name, $projectid, $converter)
+	{
+		if ($this->_is_reserved ($name, TRUE))
+		{
+			$ex0 = $this->_trans_reserved ($name);
+			//redirect ("{$ex0}/home/{$projectid}");
+			$link->type = $ex0;
+			$link->target = 'home';
+			$link->projectid = $projectid;
+			if ($link->projectid == NULL) return FALSE;
+
+			$link->extra = NULL;
+			return $link;
+		}
+		else
+		{
+			$ex = explode (':', $name);
+			$cnt = count($ex);
+			if ($cnt == 2)
+			{
+				if ($this->_is_reserved ($ex[0], TRUE))
+				{
+					$ex0 = $this->_trans_reserved ($ex[0]);
+					$ex1 = ($ex[1] == '')? $projectid: $ex[1];
+
+					//redirect ("{$ex0}/home/{$ex1}");
+
+					$link->type = $ex0;
+					$link->target = 'home';
+					$link->projectid = $ex1;
+					if ($link->projectid == NULL) return FALSE;
+
+					$link->extra = NULL;
+					return $link;
+				}
+			}
+			else if ($cnt == 3)
+			{
+				if ($this->_is_reserved ($ex[0], TRUE) && 
+				    $ex[0] != '__PROJECT__' && $ex[0] != '__CODE__')
+				{
+					$ex0 = $this->_trans_reserved ($ex[0]);
+					$ex1 = ($ex[1] == '')? $projectid: $ex[1];
+					$ex2 = $converter->AsciiToHex ($ex[2]);
+					//redirect ("{$ex0}/show/{$ex1}/{$ex2}");
+
+					$link->type = $ex0;
+					$link->target = 'show';
+					$link->projectid = $ex1;
+					if ($link->projectid == NULL) return FALSE;
+
+					$link->extra = $ex2;
+					return $link;
+				}
+			}
+			else if ($cnt == 4)
+			{
+				if ($ex[0] == '__CODE__')
+				{
+					$ex0 = $this->_trans_reserved ($ex[0]);
+					$ex1 = ($ex[1] == '')? $projectid: $ex[1];
+					if ($ex[2] == 'file' || $ex[2] == 'history' || 
+					    $ex[2] == 'blame' || $ex[2] == 'diff')
+					{
+						$ex3 = $converter->AsciiToHex ($ex[3]);
+						//redirect ("{$ex0}/{$ex[2]}/{$ex1}/{$ex3}");
+						$link->type = $ex0;
+						$link->target = $ex[2];
+						$link->projectid = $ex1;
+						if ($link->projectid == NULL) return FALSE;
+
+						$link->extra = $ex3;
+						return $link;
+					}
+
+					return FALSE;
+				}
+			}
+		}
+
+		return NULL; // not an error
+	}
+
+	function _trans_reserved ($name)
+	{
+		return substr (strtolower ($name), 2, strlen($name) -  4);
+	}
+
+	function _is_reserved ($name, $exact)
+	{
+		if ($exact)
+		{
+			return $name == '__PROJECT__' ||
+			       $name == '__WIKI__' ||
+			       $name == '__FILE__' ||
+			       $name == '__CODE__' ||
+			       $name == '__ISSUE__';
+		}
+		else
+		{
+			return substr ($name, 0, 11) == '__PROJECT__' ||
+			       substr ($name, 0, 8) == '__WIKI__' ||
+			       substr ($name, 0, 8) == '__FILE__' ||
+			       substr ($name, 0, 8) == '__CODE__' ||
+			       substr ($name, 0, 9) == '__ISSUE__';
+		}
+	}
+} 
+?>

codepot/src/codepot/views/Makefile.am

@@ -24,7 +24,7 @@ www_DATA =  \
 	project_home.php \
 	project_list.php \
 	projectbar.php \
-	site_adminhome.php \
+	site_catalog.php \
 	site_edit.php \
 	site_delete.php \
 	site_home.php \

codepot/src/codepot/views/Makefile.in

@@ -187,7 +187,7 @@ www_DATA = \
 	project_home.php \
 	project_list.php \
 	projectbar.php \
-	site_adminhome.php \
+	site_catalog.php \
 	site_edit.php \
 	site_delete.php \
 	site_home.php \

codepot/src/codepot/views/code_blame.php

@@ -27,6 +27,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'code',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/code_diff.php

@@ -27,6 +27,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'code',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/code_file.php

@@ -27,6 +27,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'code',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/code_folder.php

@@ -21,6 +21,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'code',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/code_history.php

@@ -21,6 +21,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'code',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/code_revision.php

@@ -21,6 +21,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'code',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/error.php

@@ -26,6 +26,7 @@ if (!isset($site))  $site = NULL;
 $this->load->view (
         'projectbar',
         array (
+		'banner' => NULL,
                 'site' => $site,
                 'project' => $project,
                 'pageid' => '',
@@ -37,9 +38,9 @@ $this->load->view (
 <!---------------------------------------------------------------------------->
 <div class="mainarea" id="project_error_mainarea">
 <div class="title" id="project_error_title">
-<?= $title ?>
+<?= htmlspecialchars($title) ?>
 </div>
-<?= $message ?>
+<?= htmlspecialchars($message) ?>
 </div>
 
 <?php $this->load->view ('footer'); ?>

codepot/src/codepot/views/file_delete.php

@@ -21,6 +21,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'file',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/file_edit.php

@@ -21,6 +21,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'file',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/file_home.php

@@ -21,6 +21,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'file',
 		'ctxmenuitems' => array (

codepot/src/codepot/views/file_show.php

@@ -35,6 +35,7 @@ $hexname = $this->converter->AsciiToHex ($file->name);
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'file',
 		'ctxmenuitems' => array (

codepot/src/codepot/views/issue_delete.php

@@ -21,6 +21,7 @@
 $this->load->view (
         'projectbar',
         array (
+		'banner' => NULL,
 		'site' => NULL,
                 'pageid' => 'issue',
                 'ctxmenuitems' => array ()

codepot/src/codepot/views/issue_edit.php

@@ -22,6 +22,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'issue',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/issue_home.php

@@ -69,6 +69,7 @@ $(function () {
 $this->load->view (
 	'projectbar', 
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'issue',
 		'ctxmenuitems' => array (

codepot/src/codepot/views/issue_show.php

@@ -159,6 +159,7 @@ $hexid = $this->converter->AsciiToHex ($issue->id);
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'issue',
 		'ctxmenuitems' => array (

codepot/src/codepot/views/log.php

@@ -31,6 +31,7 @@ if (!isset($site))  $site = NULL;
 $this->load->view (
         'projectbar',
         array (
+		'banner' => NULL,
 		'site' => $site,
 		'project' => $project,
 		'pageid' => ((isset($project) && $project != NULL)? 'project': 'sitelog'),

codepot/src/codepot/views/login.php

@@ -28,6 +28,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,	
 		'site' => NULL,
 		'project' => NULL,
 		'pageid' => '',

codepot/src/codepot/views/project_delete.php

@@ -20,6 +20,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'project',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/project_edit.php

@@ -21,6 +21,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'project' => (($mode != 'create')? $project: NULL),
 		'pageid' => 'project',

codepot/src/codepot/views/project_home.php

@@ -35,6 +35,7 @@ function render_wiki()
 $this->load->view (
 	'projectbar', 
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'project',
 		'ctxmenuitems' => array (

codepot/src/codepot/views/project_list.php

@@ -4,6 +4,17 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/project.css" />
+
+<script type="text/javascript" src="<?=base_url()?>/js/jquery.min.js"></script>
+<script type="text/javascript" src="<?=base_url()?>/js/jquery-ui.min.js"></script>
+<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/jquery-ui.css" />
+
+<script type="text/javascript">
+$(function () {
+	$('#project_list_mainarea_result').tabs();
+});
+</script>
+
 <?php
 	$caption = $this->lang->line('Projects');
 	if ($login['id'] != '') $caption .= "({$login['id']})";
@@ -25,6 +36,7 @@
 $this->load->view (
         'projectbar',
         array (
+		'banner' => NULL,
 		'site' => NULL,
 		'project' => NULL,
 		'pageid' => '',
@@ -39,7 +51,29 @@ $this->load->view (
 
 <div class="mainarea" id="project_list_mainarea">
 
-<div class="title"><?=$this->lang->line('My projects')?></div>
+<?php
+$num_projects = count($projects);
+$num_other_projects = count($other_projects);
+?>
+
+<div id="project_list_mainarea_result">
+<ul>
+<?php if ($login['id'] != '' || $num_projects > 0): ?>
+<li>
+	<a href='#project_list_mainarea_result_my_projects'>
+		<?=$this->lang->line('My projects')?> (<?=$num_projects?>)
+	</a>
+</li>
+<?php endif; ?>
+<li>
+	<a href='#project_list_mainarea_result_other_projects'>
+		<?=$this->lang->line('Other projects')?> (<?=$num_other_projects?>)
+	</a>
+</li>
+</ul>
+
+<?php if ($login['id'] != '' || $num_projects > 0): ?>
+<div id="project_list_mainarea_result_my_projects">
 <ul>
 <?php 
 foreach ($projects as $project) 
@@ -51,8 +85,10 @@ foreach ($projects as $project)
 }
 ?>
 </ul>
+</div>
+<?php endif; ?>
 
-<div class="title"><?=$this->lang->line('Other projects')?></div>
+<div id="project_list_mainarea_result_other_projects">
 <ul>
 <?php 
 foreach ($other_projects as $project) 
@@ -63,6 +99,9 @@ foreach ($other_projects as $project)
 }
 ?>
 </ul>
+</div>
+
+</div> <!-- project_list_mainarea_result -->
 
 </div> <!-- project_list_mainarea -->
 

codepot/src/codepot/views/projectbar.php

@@ -1,11 +1,15 @@
 <div class="projectbar">
 
 <?php
-function show_projectbar ($con, $site, $project, $pageid, $ctxmenuitems)
+function show_projectbar ($con, $banner, $site, $project, $pageid, $ctxmenuitems)
 {
 	print "<div class='title'>";
 
-	if (isset($project)) 
+	if (isset($banner))
+	{
+		print htmlspecialchars($banner);
+	}
+	else if (isset($project)) 
 	{
 		if ($project->name == '')
 			print $project->id;
@@ -15,7 +19,9 @@ function show_projectbar ($con, $site, $project, $pageid, $ctxmenuitems)
 			print htmlspecialchars($project->name) . " ({$project->id})";
 	}
 	else if (isset($site) && $site->name != '') 
+	{
 		print htmlspecialchars($site->name);
+	}
 	else print htmlspecialchars(CODEPOT_DEFAULT_SITE_NAME);
 
 	print "</div>";
@@ -34,7 +40,7 @@ function show_projectbar ($con, $site, $project, $pageid, $ctxmenuitems)
 
 	print '<div class="fixedmenu">';
 
-	if (isset($project))
+	if (isset($project) && $pageid != '')
 	{
 		$menuitems = array (
 			array ("project/home/{$project->id}", $con->lang->line('Overview')),
@@ -67,12 +73,28 @@ function show_projectbar ($con, $site, $project, $pageid, $ctxmenuitems)
 			print anchor ($menulink, $item[1], $extra);
 		}
 	}
+	else if (isset($site) && $pageid != '')
+	{
+		$menuitems = array (
+			array ("site/catalog", $con->lang->line('Sites'))
+		);
+
+		foreach ($menuitems as $item)
+		{
+			$menuid = substr ($item[0], 0, strpos($item[0], '/'));
+			$extra = ($menuid == $pageid)? 'class="selected"': '';
+			$menulink = $item[0];
+
+			print anchor ($menulink, $item[1], $extra);
+		}
+	}
+		
 	else print '&nbsp;';
 
 	print '</div>';
 }
 
-show_projectbar ($this, $site, $project, $pageid, $ctxmenuitems);
+show_projectbar ($this, $banner, $site, $project, $pageid, $ctxmenuitems);
 ?>
 
 </div>

codepot/src/codepot/views/site_catalog.php

@@ -5,23 +5,12 @@
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/common.css" />
 <link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/site.css" />
 
-<script type="text/javascript" src="<?=base_url()?>/js/jquery.min.js"></script>
-<script type="text/javascript" src="<?=base_url()?>/js/jquery-ui.min.js"></script>
-<link type="text/css" rel="stylesheet" href="<?=base_url()?>/css/jquery-ui.css" />
-
-
-<script type="text/javascript">
-$(function () {
-	$('#site_new_button').button();
-});
-</script>
-
 <title><?=htmlspecialchars($this->lang->line('Administration'))?></title>
 </head>
 
 <body>
 
-<div class="content" id="site_adminhome_content">
+<div class="content" id="site_catalog_content">
 
 <!---------------------------------------------------------------------------->
 
@@ -30,27 +19,27 @@ $(function () {
 <!---------------------------------------------------------------------------->
 
 <?php
+$site->id = '';
+$site->name = '';
+$site->text = '';
+
 $this->load->view (
         'projectbar',
         array (
-		'site' => NULL,
+		'banner' => $this->lang->line('Administration'),
+		'site' => $site,
 		'project' => NULL,
-		'pageid' => '',
+		'pageid' => 'site',
-                'ctxmenuitems' => NULL
+                'ctxmenuitems' => array (
+			array ('site/create', $this->lang->line('New'))
+		)
         )
 );
 ?>
 
 <!---------------------------------------------------------------------------->
 
-<div class="mainarea" id="site_adminhome_mainarea">
+<div class="mainarea" id="site_catalog_mainarea">
-
-<div class="title"><?=$this->lang->line('Administration')?></div>
-
-<div class="infostrip">
-<span class="title">Front Pages</span>
-<?php print anchor ('site/create', $this->lang->line('New'), 'id="site_new_button"'); ?>
-</div>
 
 <ul>
 <?php 
@@ -63,7 +52,7 @@ foreach ($sites as $site)
 ?>
 </ul>
 
-</div> <!-- site_adminhome_mainarea -->
+</div> <!-- site_catalog_mainarea -->
 
 <!---------------------------------------------------------------------------->
 
@@ -72,7 +61,7 @@ foreach ($sites as $site)
 <!---------------------------------------------------------------------------->
 
 
-</div> <!-- site_adminhome_content -->
+</div> <!-- site_catalog_content -->
 
 
 </body>

codepot/src/codepot/views/site_delete.php

@@ -20,7 +20,8 @@
 $this->load->view (
 	'projectbar',
 	array (
-		'site' => NULL,
+		'banner' => $this->lang->line('Administration'),
+		'site' => $site,
 		'project' => NULL,
 		'pageid' => 'site',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/site_edit.php

@@ -21,7 +21,8 @@
 $this->load->view (
 	'projectbar',
 	array (
-		'site' => NULL,
+		'banner' => $this->lang->line('Administration'),
+		'site' => $site,
 		'project' => NULL,
 		'pageid' => 'site',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/site_home.php

@@ -38,9 +38,10 @@ function render_wiki()
 $this->load->view (
         'projectbar',
         array (
+		'banner' => NULL,
 		'project' => NULL,
 		'site' => $site,
-		'pageid' => 'site',
+		'pageid' => '',
                 'ctxmenuitems' => NULL
         )
 );

codepot/src/codepot/views/site_show.php

@@ -36,7 +36,7 @@ function render_wiki()
 if ($login['sysadmin?'])
 {
 	$ctxmenuitems = array (
-		array ("site/create", $this->lang->line('Create')),
+		//array ("site/create", $this->lang->line('New')),
 		array ("site/update/{$site->id}", $this->lang->line('Edit')),
 		array ("site/delete/{$site->id}", $this->lang->line('Delete'))
 	);
@@ -46,6 +46,7 @@ else $ctxmenuitems = array ();
 $this->load->view (
         'projectbar',
         array (
+		'banner' => $this->lang->line('Administration'),
 		'project' => NULL,
 		'site' => $site,
 		'pageid' => 'site',
@@ -58,6 +59,10 @@ $this->load->view (
 
 <div class="mainarea" id="site_show_mainarea">
 
+<div class="title">
+<?=htmlspecialchars($site->name)?> (<?=htmlspecialchars($site->id)?>)
+</div>
+
 <div id="site_show_mainarea_text">
 <pre id="site_show_mainarea_textpre" style="visibility: hidden">
 <?php print htmlspecialchars($site->text); ?>

codepot/src/codepot/views/taskbar.php

@@ -40,7 +40,7 @@ function show_taskbar ($con, $loginid, $issysadmin)
 	print anchor ('site/home', $con->lang->line('Home'));
 	print anchor ('site/projectlist', $con->lang->line('Projects'));
 	if ($issysadmin)
-		print anchor ('site/adminhome', $con->lang->line('Administration'));
+		print anchor ('site/catalog', $con->lang->line('Administration'));
 	print '</div>';
 
 	print '</div>';

codepot/src/codepot/views/wiki_delete.php

@@ -21,6 +21,7 @@
 $this->load->view (
         'projectbar',
         array (
+		'banner' => NULL,
 		'site' => NULL,
                 'pageid' => 'wiki',
                 'ctxmenuitems' => array ()

codepot/src/codepot/views/wiki_edit.php

@@ -21,6 +21,7 @@
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'wiki',
 		'ctxmenuitems' => array ()

codepot/src/codepot/views/wiki_home.php

@@ -21,6 +21,7 @@
 $this->load->view (
 	'projectbar', 
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'wiki',
 		'ctxmenuitems' => array (

codepot/src/codepot/views/wiki_show.php

@@ -35,6 +35,7 @@ $hexname = $this->converter->AsciiToHex ($wiki->name);
 $this->load->view (
 	'projectbar',
 	array (
+		'banner' => NULL,
 		'site' => NULL,
 		'pageid' => 'wiki',
 		'ctxmenuitems' => array (

codepot/src/css/common.css

@@ -9,6 +9,10 @@ body {
 	font-family: sans-serif;
 }
 
+.content ul {
+	list-style: square;
+}
+
 .content .taskbar {
 	font-size: 0.9em;
 	font-weight: bold;
@@ -251,6 +255,24 @@ body {
 	background-color: inherit;
 }
 
+.content .mainarea table.wiki th {
+        background-color: #bbccdd;
+}
+
+.content .mainarea table.wiki td {
+        vertical-align: top;
+        border-bottom: 1px dashed #bbccdd;
+}
+
+.content .mainarea p.wiki {
+	/* use the default for normal cases */
+}
+
+.content .mainarea table p.wiki {
+	/* no margin-top within tables */
+	margin-top: 0;
+}
+
 .content .mainarea pre.prettyprint {
 	/* anything that make prettyprint area different from other pres? */
 	background-color: #FFFFFF;
@@ -308,10 +330,19 @@ pre.prettyprint .nocode a:hover {
 
 .content .infostrip {
 	font-size: 0.9em;
+
         background: #E5ECF9 none repeat scroll 0 0;
+        border: #D4DBE8 1px solid; 
+        /*background: #DDDDDD none repeat scroll 0 0;
+	border: 1px solid #CCCCCC;*/
+
 	margin: 0.3em 0em 0em 0em;
 	padding: 0.3em 0.3em 0.3em 0.3em;
 	text-align: right;
+	-moz-border-radius-bottomleft:2px;
+	-moz-border-radius-bottomright:2px;
+	-moz-border-radius-topleft:2px;
+	-moz-border-radius-topright:2px;
 }
 
 .content .infostrip a {
@@ -329,9 +360,17 @@ pre.prettyprint .nocode a:hover {
         padding:8px 8px 8px 8px;
         margin: 1px 1px 2px 1px;
         display:block;
-        border: none;
-        background: #E5ECF9 none repeat scroll 0 0;
 	overflow: auto;
+
+        background: #E5ECF9 none repeat scroll 0 0;
+        border: #D4DBE8 1px solid; 
+        /* background: #DDDDDD none repeat scroll 0 0;
+        border: #CCCCCC 1px solid; */
+
+	-moz-border-radius-bottomleft:2px;
+	-moz-border-radius-bottomright:2px;
+	-moz-border-radius-topleft:2px;
+	-moz-border-radius-topright:2px;
 }
 
 .content .sidebar .boxtitle {
@@ -361,10 +400,6 @@ pre.prettyprint .nocode a:hover {
 	padding: 0.2em 0 0.2em 1em;
 }
 
-.content .sidebar ul li {
-	list-style: square;
-}
-
 .content .sidebar a {
 	text-decoration: none;
 	padding-left: .2em;

codepot/src/css/images/Makefile.am

@@ -38,19 +38,18 @@ www_DATA =  \
 	textbg.png \
 	toggledown.png \
 	toggleup.png \
-	ui-bg_diagonals-thick_18_b81900_40x40.png \
+	ui-bg_flat_0_aaaaaa_40x100.png \
-	ui-bg_diagonals-thick_20_666666_40x40.png \
+	ui-bg_flat_0_eeeeee_40x100.png \
-	ui-bg_flat_10_000000_40x100.png \
+	ui-bg_flat_55_ffffff_40x100.png \
-	ui-bg_glass_100_f6f6f6_1x400.png \
+	ui-bg_flat_75_ffffff_40x100.png \
-	ui-bg_glass_100_fdf5ce_1x400.png \
 	ui-bg_glass_65_ffffff_1x400.png \
-	ui-bg_gloss-wave_35_f6a828_500x100.png \
+	ui-bg_highlight-soft_100_f6f6f6_1x100.png \
-	ui-bg_highlight-soft_100_eeeeee_1x100.png \
+	ui-bg_highlight-soft_25_0073ea_1x100.png \
-	ui-bg_highlight-soft_75_ffe45c_1x100.png \
+	ui-bg_highlight-soft_50_dddddd_1x100.png \
-	ui-icons_222222_256x240.png \
+	ui-icons_0073ea_256x240.png \
-	ui-icons_228ef1_256x240.png \
+	ui-icons_454545_256x240.png \
-	ui-icons_ef8c08_256x240.png \
+	ui-icons_666666_256x240.png \
-	ui-icons_ffd27a_256x240.png \
+	ui-icons_ff0084_256x240.png \
 	ui-icons_ffffff_256x240.png \
 	up.png 
 

codepot/src/css/images/Makefile.in

@@ -201,19 +201,18 @@ www_DATA = \
 	textbg.png \
 	toggledown.png \
 	toggleup.png \
-	ui-bg_diagonals-thick_18_b81900_40x40.png \
+	ui-bg_flat_0_aaaaaa_40x100.png \
-	ui-bg_diagonals-thick_20_666666_40x40.png \
+	ui-bg_flat_0_eeeeee_40x100.png \
-	ui-bg_flat_10_000000_40x100.png \
+	ui-bg_flat_55_ffffff_40x100.png \
-	ui-bg_glass_100_f6f6f6_1x400.png \
+	ui-bg_flat_75_ffffff_40x100.png \
-	ui-bg_glass_100_fdf5ce_1x400.png \
 	ui-bg_glass_65_ffffff_1x400.png \
-	ui-bg_gloss-wave_35_f6a828_500x100.png \
+	ui-bg_highlight-soft_100_f6f6f6_1x100.png \
-	ui-bg_highlight-soft_100_eeeeee_1x100.png \
+	ui-bg_highlight-soft_25_0073ea_1x100.png \
-	ui-bg_highlight-soft_75_ffe45c_1x100.png \
+	ui-bg_highlight-soft_50_dddddd_1x100.png \
-	ui-icons_222222_256x240.png \
+	ui-icons_0073ea_256x240.png \
-	ui-icons_228ef1_256x240.png \
+	ui-icons_454545_256x240.png \
-	ui-icons_ef8c08_256x240.png \
+	ui-icons_666666_256x240.png \
-	ui-icons_ffd27a_256x240.png \
+	ui-icons_ff0084_256x240.png \
 	ui-icons_ffffff_256x240.png \
 	up.png 
 

codepot/src/css/issue.css

@@ -163,19 +163,10 @@
 	background-color: #F1F1FF;
 }
 
-.project_issue_show_mainarea_changes_list ul {
-	list-style: square;
-}
-
 .project_issue_show_mainarea_changes_list ul li {
 	padding-bottom: 0.3em;
 }
 
-.project_issue_show_mainarea_changes_comment p {
-	margin-top: 0;
-}
-
-
 /*---------------------------------------------
  * issue edit
  *---------------------------------------------*/

codepot/src/css/jquery-ui.css

@@ -41,7 +41,6 @@
 * jQuery UI CSS Framework
 * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
 * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=&fwDefault=normal&fsDefault=&cornerRadius=1px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px
 */
 
 
@@ -50,28 +49,28 @@
 .ui-widget { }
 .ui-widget .ui-widget { }
 .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {  }
-.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; }
+.ui-widget-content { border: 1px solid #dddddd; background: #ffffff url(images/ui-bg_flat_75_ffffff_40x100.png) 50% 50% repeat-x; color: #444444; }
-.ui-widget-content a { color: #333333; }
+.ui-widget-content a { color: #444444; }
-.ui-widget-header { border: 1px solid #e78f08; background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x; color: #ffffff; font-weight: bold; }
+.ui-widget-header { border: 1px solid #dddddd; background: #dddddd url(images/ui-bg_highlight-soft_50_dddddd_1x100.png) 50% 50% repeat-x; color: #444444; font-weight: bold; }
-.ui-widget-header a { color: #ffffff; }
+.ui-widget-header a { color: #444444; }
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #1c94c4; }
+.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #dddddd; background: #f6f6f6 url(images/ui-bg_highlight-soft_100_f6f6f6_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #0073ea; }
-.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #0073ea; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url(images/ui-bg_glass_100_fdf5ce_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #c77405; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #0073ea; background: #0073ea url(images/ui-bg_highlight-soft_25_0073ea_1x100.png) 50% 50% repeat-x; font-weight: bold; color: #ffffff; }
-.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; }
+.ui-state-hover a, .ui-state-hover a:hover { color: #ffffff; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #fbd850; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #eb8f00; }
+.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #dddddd; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #eb8f00; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #eb8f00; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #cccccc; background: #ffffff url(images/ui-bg_flat_55_ffffff_40x100.png) 50% 50% repeat-x; color: #444444; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #444444; }
-.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; }
+.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #eb8f00; background: #ffffff url(images/ui-bg_flat_55_ffffff_40x100.png) 50% 50% repeat-x; color: #222222; }
-.ui-state-error a, .ui-widget-content .ui-state-error a { color: #ffffff; }
+.ui-state-error a, .ui-widget-content .ui-state-error a { color: #222222; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #ffffff; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #222222; }
 .ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
 .ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
 .ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
@@ -80,14 +79,14 @@
 ----------------------------------*/
 
 /* states and images */
-.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_ff0084_256x240.png); }
-.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); }
+.ui-widget-content .ui-icon {background-image: url(images/ui-icons_ff0084_256x240.png); }
-.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
+.ui-widget-header .ui-icon {background-image: url(images/ui-icons_0073ea_256x240.png); }
-.ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-default .ui-icon { background-image: url(images/ui-icons_666666_256x240.png); }
-.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); }
-.ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); }
+.ui-state-active .ui-icon {background-image: url(images/ui-icons_454545_256x240.png); }
-.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); }
+.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_0073ea_256x240.png); }
-.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); }
+.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ff0084_256x240.png); }
 
 /* positioning */
 .ui-icon-carat-1-n { background-position: 0 0; }
@@ -271,19 +270,19 @@
 ----------------------------------*/
 
 /* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 1px; -webkit-border-top-left-radius: 1px; border-top-left-radius: 1px; }
+.ui-corner-tl { -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; border-top-left-radius: 2px; }
-.ui-corner-tr { -moz-border-radius-topright: 1px; -webkit-border-top-right-radius: 1px; border-top-right-radius: 1px; }
+.ui-corner-tr { -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; border-top-right-radius: 2px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 1px; -webkit-border-bottom-left-radius: 1px; border-bottom-left-radius: 1px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 2px; -webkit-border-bottom-left-radius: 2px; border-bottom-left-radius: 2px; }
-.ui-corner-br { -moz-border-radius-bottomright: 1px; -webkit-border-bottom-right-radius: 1px; border-bottom-right-radius: 1px; }
+.ui-corner-br { -moz-border-radius-bottomright: 2px; -webkit-border-bottom-right-radius: 2px; border-bottom-right-radius: 2px; }
-.ui-corner-top { -moz-border-radius-topleft: 1px; -webkit-border-top-left-radius: 1px; border-top-left-radius: 1px; -moz-border-radius-topright: 1px; -webkit-border-top-right-radius: 1px; border-top-right-radius: 1px; }
+.ui-corner-top { -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; border-top-left-radius: 2px; -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; border-top-right-radius: 2px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 1px; -webkit-border-bottom-left-radius: 1px; border-bottom-left-radius: 1px; -moz-border-radius-bottomright: 1px; -webkit-border-bottom-right-radius: 1px; border-bottom-right-radius: 1px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 2px; -webkit-border-bottom-left-radius: 2px; border-bottom-left-radius: 2px; -moz-border-radius-bottomright: 2px; -webkit-border-bottom-right-radius: 2px; border-bottom-right-radius: 2px; }
-.ui-corner-right {  -moz-border-radius-topright: 1px; -webkit-border-top-right-radius: 1px; border-top-right-radius: 1px; -moz-border-radius-bottomright: 1px; -webkit-border-bottom-right-radius: 1px; border-bottom-right-radius: 1px; }
+.ui-corner-right {  -moz-border-radius-topright: 2px; -webkit-border-top-right-radius: 2px; border-top-right-radius: 2px; -moz-border-radius-bottomright: 2px; -webkit-border-bottom-right-radius: 2px; border-bottom-right-radius: 2px; }
-.ui-corner-left { -moz-border-radius-topleft: 1px; -webkit-border-top-left-radius: 1px; border-top-left-radius: 1px; -moz-border-radius-bottomleft: 1px; -webkit-border-bottom-left-radius: 1px; border-bottom-left-radius: 1px; }
+.ui-corner-left { -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; border-top-left-radius: 2px; -moz-border-radius-bottomleft: 2px; -webkit-border-bottom-left-radius: 2px; border-bottom-left-radius: 2px; }
-.ui-corner-all { -moz-border-radius: 1px; -webkit-border-radius: 1px; border-radius: 1px; }
+.ui-corner-all { -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; }
 
 /* Overlays */
-.ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); }
+.ui-widget-overlay { background: #eeeeee url(images/ui-bg_flat_0_eeeeee_40x100.png) 50% 50% repeat-x; opacity: .80;filter:Alpha(Opacity=80); }
-.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/* Resizable
+.ui-widget-shadow { margin: -4px 0 0 -4px; padding: 4px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .60;filter:Alpha(Opacity=60); -moz-border-radius: 0px; -webkit-border-radius: 0px; border-radius: 0px; }/* Resizable
 ----------------------------------*/
 .ui-resizable { position: relative;}
 .ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
@@ -300,7 +299,7 @@
 .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
 .ui-accordion .ui-accordion-li-fix { display: inline; }
 .ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
-.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; }
+.ui-accordion .ui-accordion-header a { display: block; padding: .5em .5em .5em .7em; }
 .ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
 .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
 .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
@@ -332,7 +331,8 @@
 	text-decoration:none;
 	display:block;
 	padding:.2em .4em;
-	/*line-height:1.5;*/
+	line-height:1.5;
+	zoom:1;
 }
 .ui-menu .ui-menu-item a.ui-state-hover,
 .ui-menu .ui-menu-item a.ui-state-active {
@@ -344,27 +344,27 @@
 .ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
 .ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
 button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
-.ui-button-icons-only { width: 3em; } 
+.ui-button-icons-only { width: 3.4em; } 
-button.ui-button-icons-only { width: 3.2em; } 
+button.ui-button-icons-only { width: 3.7em; } 
 
 /*button text element */
-.ui-button .ui-button-text { display: block; /*line-height: 1.4;*/  }
+.ui-button .ui-button-text { display: block; line-height: 1.4;  }
 .ui-button-text-only .ui-button-text { padding: .4em 1em; }
 .ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 1.8em; }
+.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
-.ui-button-text-icons .ui-button-text { padding-right: 1.8em; }
+.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
 /* no icon support for input elements, provide padding by default */
 input.ui-button { padding: .4em 1em; }
 
 /*button icon element(s) */
 .ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
 .ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon .ui-icon-primary, .ui-button-text-icons .ui-icon-primary, .ui-button-icons-only .ui-icon-primary { left: .5em; }
+.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
 .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
 
 /*button sets*/
-.ui-button-set { margin-right: 7px; }
+.ui-buttonset { margin-right: 7px; }
-.ui-button-set .ui-button { margin-left: 0; margin-right: -.3em; }
+.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; }
 
 /* workarounds */
 button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
@@ -376,13 +376,13 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 /* Dialog
 ----------------------------------*/
 .ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .1em 1em .1em; position: relative;  }
+.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative;  }
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } 
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
 .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
-.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .1em 0 0 0; padding: .1em 1em .2em .4em; }
+.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .1em 1em .3em .4em; }
 .ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
 .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
 .ui-draggable .ui-dialog-titlebar { cursor: move; }
@@ -425,7 +425,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-datepicker .ui-datepicker-next-hover { right:1px; }
 .ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px;  }
 .ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; }
-.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; }
+.ui-datepicker .ui-datepicker-title select { margin:1px 0; }
 .ui-datepicker select.ui-datepicker-month-year {width: 100%;}
 .ui-datepicker select.ui-datepicker-month, 
 .ui-datepicker select.ui-datepicker-year { width: 49%;}

codepot/src/css/project.css

@@ -379,13 +379,26 @@
 }
 
 /*----------------------------------------------- 
- * project source diff view 
+ * project list view 
  *-----------------------------------------------*/
-#project_wiki_show_textarea table th {
+#project_list_mainarea_result {
-	background-color: #bbccdd;
+	background: none;
+	border: none;
+	background-color: inherit;
+	padding: 0;
 }
 
-#project_wiki_show_textarea table td {
+#project_list_mainarea_result ul {
-	vertical-align: top;
+}
-	border-bottom: 1px dashed #bbccdd;
+
+#project_list_mainarea_result ul li {
+	padding-left: 0.2em;
+}
+
+#project_list_mainarea_result_my_projects {
+	padding: 0;
+}
+
+#project_list_mainarea_result_other_projects {
+	padding: 0;
 }

codepot/src/css/site.css

@@ -44,13 +44,6 @@
 	width: 1px;
 }
 
-/*----------------------------------------------- 
- * site adminhome view 
- *-----------------------------------------------*/
-#site_adminhome_mainarea .infostrip span.title {
-	float: left;
-}
-
 /*----------------------------------------------- 
  * site edit view 
  *-----------------------------------------------*/

codepot/src/js/creole.js

@@ -316,7 +316,8 @@ var Url = {
             replaceRegex: /(^|\n)[ \t]*[*#]/g, replaceString: '$1' },
 
         table: { tag: 'table', capture: 0,
-            regex: /(^|\n)(\|.*?[ \t]*(\n|$))+/ },
+            regex: /(^|\n)(\|.*?[ \t]*(\n|$))+/, 
+            attrs: { 'class': 'wiki' } },
         tr: { tag: 'tr', capture: 2, regex: /(^|\n)(\|.*?)\|?[ \t]*(\n|$)/ },
         th: { tag: 'th', regex: /\|+=([^|]*)/, capture: 1 },
         td: { tag: 'td', capture: 1,
@@ -327,7 +328,8 @@ var Url = {
 
         singleLine: { regex: /.+/, capture: 0 },
         paragraph: { tag: 'p', capture: 0,
-            regex: /(^|\n)([ \t]*\S.*(\n|$))+/ },
+            regex: /(^|\n)([ \t]*\S.*(\n|$))+/,
+            attrs: { 'class': 'wiki' } },
         text: { capture: 0, regex: /(^|\n)([ \t]*[^\s].*(\n|$))+/ },
 
         strong: { tag: 'strong', capture: 1,