diff --git a/codepot/src/codepot/controllers/main.php b/codepot/src/codepot/controllers/main.php index c4fb0689..b0808abd 100644 --- a/codepot/src/codepot/controllers/main.php +++ b/codepot/src/codepot/controllers/main.php @@ -32,7 +32,7 @@ class Main extends Controller $data['message'] = ''; - if($this->input->post('login')) + if($this->input->post('user_name')) { $user_name = $this->input->post('user_name'); $user_pass = $this->input->post('user_pass'); diff --git a/codepot/src/codepot/controllers/project.php b/codepot/src/codepot/controllers/project.php index 428a7fdd..7af53fca 100644 --- a/codepot/src/codepot/controllers/project.php +++ b/codepot/src/codepot/controllers/project.php @@ -52,7 +52,6 @@ class Project extends Controller $this->load->library ('pagination'); - if ($filter == '' && $offset == '') { $offset = 0; @@ -463,6 +462,36 @@ class Project extends Controller $this->load->view ($this->VIEW_LOG, $data); } } + + function search_json ($needle = '') + { + $this->load->model ('ProjectModel', 'projects'); + + $login = $this->login->getUser (); + if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '') + { + $projects = array (); + } + else if (empty($needle)) + { + // return no result if $needle is empty + $projects = array (); + } + else + { + $projects = $this->projects->findIDsAndNames ($login['id'], $needle); + if ($projects === FALSE) + { + $projects = array (); + } + } + + foreach ($projects as &$p) + { + $p->value = $p->id . ' - ' . $p->value; + } + print codepot_json_encode ($projects); + } } ?> diff --git a/codepot/src/codepot/language/english/common_lang.php b/codepot/src/codepot/language/english/common_lang.php index 5de0ca1b..874b3dc8 100644 --- a/codepot/src/codepot/language/english/common_lang.php +++ b/codepot/src/codepot/language/english/common_lang.php @@ -69,6 +69,7 @@ $lang['Path'] = 'Path'; $lang['Preview'] = 'Preview'; $lang['Priority'] = 'Priority'; $lang['Project'] = 'Project'; +$lang['Project ID'] = 'Project ID'; $lang['Projects'] = 'Projects'; $lang['Public'] = 'Public'; $lang['Purge'] = 'Purge'; diff --git a/codepot/src/codepot/language/indonesian/common_lang.php b/codepot/src/codepot/language/indonesian/common_lang.php index 45a63efd..a935fcff 100644 --- a/codepot/src/codepot/language/indonesian/common_lang.php +++ b/codepot/src/codepot/language/indonesian/common_lang.php @@ -67,6 +67,7 @@ $lang['Path'] = 'Path'; $lang['Preview'] = 'Preview'; $lang['Priority'] = 'Pirority'; $lang['Project'] = 'Proyek'; +$lang['Project ID'] = 'Proyek ID'; $lang['Projects'] = 'Proyek'; $lang['Public'] = 'Public'; $lang['Purge'] = 'Purge'; diff --git a/codepot/src/codepot/language/korean/common_lang.php b/codepot/src/codepot/language/korean/common_lang.php index a8761a81..65b97695 100644 --- a/codepot/src/codepot/language/korean/common_lang.php +++ b/codepot/src/codepot/language/korean/common_lang.php @@ -69,6 +69,7 @@ $lang['Path'] = '경로'; $lang['Preview'] = '미리보기'; $lang['Priority'] = '중요도'; $lang['Project'] = '프로젝트'; +$lang['Project ID'] = '프로젝트 아이디'; $lang['Projects'] = '프로젝트'; $lang['Public'] = '공개'; $lang['Purge'] = '정화하기'; diff --git a/codepot/src/codepot/models/projectmodel.php b/codepot/src/codepot/models/projectmodel.php index 76a57bfa..358a27df 100644 --- a/codepot/src/codepot/models/projectmodel.php +++ b/codepot/src/codepot/models/projectmodel.php @@ -92,6 +92,18 @@ class ProjectModel extends Model return $query->result (); } + function findIDsAndNames ($userid, $needle) + { + $this->db->trans_start (); + $this->db->select(array('id', 'name as value')); // jquery ui autocomplete seems to require 'value'. + $this->db->order_by ('id', 'asc'); + $this->db->like ('id', $needle); + $this->db->or_like ('name', $needle); + $query = $this->db->get ('project'); + $this->db->trans_complete (); + if ($this->db->trans_status() === FALSE) return FALSE; + return $query->result (); + } function create ($userid, $project, $api_base_url) { diff --git a/codepot/src/codepot/models/subversionmodel.php b/codepot/src/codepot/models/subversionmodel.php index 266b1f38..47ed0fb1 100644 --- a/codepot/src/codepot/models/subversionmodel.php +++ b/codepot/src/codepot/models/subversionmodel.php @@ -287,7 +287,6 @@ class SubversionModel extends Model function _get_diff ($diff, $src1, $src2, $all, $ent) { /* copied from websvn */ - if ($all) { //$ofile = fopen ($oldtname, "r"); @@ -315,7 +314,8 @@ class SubversionModel extends Model $curoline = 1; $curnline = 1; - while (!feof($diff)) + $abort = FALSE; + while (!feof($diff) && !$abort) { // Get the first line of this range sscanf($line, "@@ -%d", $oline); @@ -378,13 +378,43 @@ class SubversionModel extends Model $index++; } - $fin = false; + $fin = FALSE; while (!feof($diff) && !$fin) { $line = fgets($diff); - if ($line === false || strncmp($line, "@@", 2) == 0) + if ($line === FALSE || $line == "\n") { - $fin = true; + // fgets() returned failure or an empty line has been read. + // An empty line can be read if property changes exist. + // The line before 'Property changes on: ..' is an empty line. + // + // Index: test1.txt + // =================================================================== + // --- test1.txt (revision 14) + // +++ test1.txt (working copy) + // @@ -1 +1,6 @@ + // hello world + // + + // + + // +hello world 2 + // + + // +hello world 3 + // + // Property changes on: test1.txt + // ___________________________________________________________________ + // Added: test + // + xxx + // Added: abcprop + // + on + // Deleted: svn:executable + // - * + // + $fin = TRUE; + $abort = TRUE; + } + else if (strncmp($line, "@@", 2) == 0) + { + $fin = TRUE; } else { @@ -454,7 +484,6 @@ class SubversionModel extends Model $curnline++; } - // Don't increment the current index count $index--; @@ -526,7 +555,6 @@ class SubversionModel extends Model //$listing[$index]["rev1line"] = " "; $listing[$index]["rev1line"] = ''; } - if (!feof($nfile)) { @@ -645,7 +673,7 @@ class SubversionModel extends Model [last_changed_rev] => 27 [last_changed_date] => 2010-02-18T01:53:13.076062Z [last_changed_author] => hyunghwan - ) + ) */ $fileinfo['fullpath'] = substr ( diff --git a/codepot/src/codepot/views/code_blame.php b/codepot/src/codepot/views/code_blame.php index 4278c3f1..c1d9567d 100644 --- a/codepot/src/codepot/views/code_blame.php +++ b/codepot/src/codepot/views/code_blame.php @@ -47,6 +47,8 @@ $(function () { "option", "label", "lang->line('Hide details')?>"); } }); + + prettyPrint (); }); @@ -58,7 +60,7 @@ $(function () { ?> - +
diff --git a/codepot/src/codepot/views/code_diff.php b/codepot/src/codepot/views/code_diff.php index 5875eab4..405525d1 100644 --- a/codepot/src/codepot/views/code_diff.php +++ b/codepot/src/codepot/views/code_diff.php @@ -16,6 +16,12 @@ + + <?php if ($headpath == '') printf ('%s', htmlspecialchars($project->name)); @@ -24,7 +30,7 @@ ?> - +
@@ -161,7 +167,7 @@ function format_diff2 ($a, $b, $css_class) $cc .= ''; } $cc .= htmlspecialchars(substr($a, $mp1, $ml)); - $k = $mp1 + $ml; + $k = $mp1 + $ml; } if ($k < strlen($a)) { @@ -348,7 +354,7 @@ if (FALSE) // don't want to delete code for the original diff view. print $x['rev1lineno']; print ''; } - + if (array_key_exists('rev2line', $x)) { $diffclass = array_key_exists('rev2diffclass', $x)? $x['rev2diffclass']: 'diff'; @@ -398,11 +404,11 @@ else $prevanc = "code/fulldiff/{$project->id}/{$xpar}/{$currev}/{$prevrev}"; print anchor ($prevanc, '<<'); print '   '; - + print $this->lang->line('Revision'); print ' '; print $file['against']['created_rev']; - + $currev = $file['created_rev']; $nextrev = $file['against']['next_rev']; $nextanc = "code/fulldiff/{$project->id}/{$xpar}/{$currev}/{$nextrev}"; @@ -443,7 +449,6 @@ else printf ("
"); print ''; - print ("
"); print "
"; diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php index 44a49d9a..0ff7cebd 100644 --- a/codepot/src/codepot/views/code_file.php +++ b/codepot/src/codepot/views/code_file.php @@ -30,10 +30,8 @@ $(function () { btn_label = "lang->line('Hide details')?>"; else btn_label = "lang->line('Show details')?>"; - btn = $("#code_file_mainarea_details_button").button({"label": btn_label}).click (function () { - if ($("#code_file_mainarea_result_info").is(":visible")) { $("#code_file_mainarea_result_info").hide("blind",{},200); @@ -47,13 +45,11 @@ $(function () { "option", "label", "lang->line('Hide details')?>"); } }); -}); -function renderCode() -{ + // for code rendering $("#code_file_mainarea_result_raw").html ($("#code_file_mainarea_result_pre").html()) prettyPrint (); -} +}); var showing_raw_code = false; @@ -85,7 +81,7 @@ function showRawCode() ?> - +
diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php index b3c133c7..b413e764 100644 --- a/codepot/src/codepot/views/code_folder.php +++ b/codepot/src/codepot/views/code_folder.php @@ -141,8 +141,26 @@ function show_loc_graph (response) //$("#code_folder_mainarea_result_info_loc_progress" ).progressbar().hide(); } - 0): ?> +function render_readme() +{ + 0 && substr_compare($readme_file, '.wiki', -5) === 0): + ?> + creole_render_wiki ( + "code_folder_mainarea_result_readme_text", + "code_folder_mainarea_result_readme", + "/wiki/show/id?>/", + "/wiki/attachment0/id?>/" + ); + prettyPrint(); + +} + + $(function () { + + 0): ?> code_hide_details == 'Y') print '$("#code_folder_mainarea_result_info").hide();'; @@ -152,7 +170,7 @@ $(function () { btn_label = "lang->line('Hide details')?>"; else btn_label = "lang->line('Show details')?>"; - + btn = $("#code_folder_mainarea_details_button").button({"label": btn_label}).click (function () { if ($("#code_folder_mainarea_result_info").is(":visible")) @@ -189,33 +207,22 @@ $(function () { }); //$("#code_folder_mainarea_result_info_loc_progress" ).progressbar().hide(); -}); -function renderReadme() -{ - 0 && substr_compare($readme_file, '.wiki', -5) === 0): - ?> - creole_render_wiki ( - "code_folder_mainarea_result_readme_text", - "code_folder_mainarea_result_readme", - "/wiki/show/id?>/", - "/wiki/attachment0/id?>/" - ); - prettyPrint(); - -} - -function hookSearchSubmit() -{ + $('#code_folder_search_submit').button().click (function (e) { + if ($.trim($("#code_folder_search_string").val()) != "") + { + $('#code_folder_search_form').submit (); + } + }); + /* $('#code_folder_search_form').submit (function(e) { if ($.trim($("#code_folder_search_string").val()) === "") { + // prevent submission when the search string is empty. e.preventDefault(); } - }); + });*/ $('#code_search_invertedly').button(); $('#code_search_case_insensitively').button(); @@ -223,7 +230,9 @@ function hookSearchSubmit() $('#code_search_in_name').button(); $('#code_search_is_regex').button(); $('.code_search_option').tooltip(); -} + + render_readme (); +}); @@ -235,7 +244,7 @@ function hookSearchSubmit() ?> - +
@@ -375,7 +384,8 @@ $this->load->view ( ); print ' '; - print form_submit('search_submit', $this->lang->line('Search'), 'id="code_folder_search_submit"'); + //print form_submit('search_submit', $this->lang->line('Search'), 'id="code_folder_search_submit"'); + printf ('%s', $this->lang->line('Search')); print ' | '; } @@ -469,7 +479,7 @@ $this->load->view ( { // directory $hexpath = $this->converter->AsciiToHex($fullpath); - print ""; + print ""; print ''; print anchor ( "code/file/{$project->id}/{$hexpath}{$revreq}", diff --git a/codepot/src/codepot/views/code_revision.php b/codepot/src/codepot/views/code_revision.php index 417e3c8c..caa656b8 100644 --- a/codepot/src/codepot/views/code_revision.php +++ b/codepot/src/codepot/views/code_revision.php @@ -172,10 +172,6 @@ $(function() { }); - - - - <?php @@ -217,7 +219,7 @@ function hide_unneeded_divs() ?> - +
diff --git a/codepot/src/codepot/views/code_search.php b/codepot/src/codepot/views/code_search.php index fd689786..b98eb0e8 100644 --- a/codepot/src/codepot/views/code_search.php +++ b/codepot/src/codepot/views/code_search.php @@ -19,15 +19,23 @@ - + @@ -49,7 +60,7 @@ function hookSearchSubmit() ?> - +
@@ -194,7 +205,8 @@ $this->load->view ( ); print ' '; - print form_submit ('search_submit', $this->lang->line('Search'), 'id="code_search_search_submit"'); + printf ('%s', $this->lang->line('Search')); + //print form_submit ('search_submit', $this->lang->line('Search'), 'id="code_search_search_submit"'); print ' | '; printf ('%s: %s', $this->lang->line('Revision'), $file['created_rev']); print form_close(); @@ -270,7 +282,6 @@ function search_and_show ($controller, $project, $path, $revision, $pattern, $in htmlspecialchars($fullpath)); print '
'; - print '
';
 						if ($in_name)
 						{
diff --git a/codepot/src/codepot/views/error.php b/codepot/src/codepot/views/error.php
index 961b6848..eed9d0d8 100644
--- a/codepot/src/codepot/views/error.php
+++ b/codepot/src/codepot/views/error.php
@@ -6,6 +6,11 @@
 
 
 
+
+
+
+
+
 <?php print $title?>
 
 
diff --git a/codepot/src/codepot/views/file_show.php b/codepot/src/codepot/views/file_show.php
index 590cb077..7575497e 100644
--- a/codepot/src/codepot/views/file_show.php
+++ b/codepot/src/codepot/views/file_show.php
@@ -20,12 +20,24 @@
 
 
 
 
 <?php print htmlspecialchars($project->name)?> - <?php print htmlspecialchars($file->name)?>
 
 
-
+
 
 

 
diff --git a/codepot/src/codepot/views/graph_main.php b/codepot/src/codepot/views/graph_main.php
index 951e1129..8e782aee 100644
--- a/codepot/src/codepot/views/graph_main.php
+++ b/codepot/src/codepot/views/graph_main.php
@@ -28,6 +28,10 @@
 
 
 
+
+
+
+
 
+
+
+
 <title><?php print htmlspecialchars($issue->id)?>
 
 
diff --git a/codepot/src/codepot/views/issue_show.php b/codepot/src/codepot/views/issue_show.php
index f2ea7f19..99c4449f 100644
--- a/codepot/src/codepot/views/issue_show.php
+++ b/codepot/src/codepot/views/issue_show.php
@@ -154,13 +154,15 @@ $(function () {
 			render_wiki_comment_preview ($("#issue_change_comment").val());
 		}
 	);
+
+	render_wiki();
 });
 
 
 <?php print htmlspecialchars($project->name)?> - <?php print $this->lang->line('Issue')?> <?php print htmlspecialchars($issue->id)?>
 
 
-
+
 
 

 
@@ -405,11 +407,9 @@ $this->load->view (
 		

 
 		

-			lang->line('Owner'),
-				'issue_change_owner')
-			?>
+		lang->line('Owner'), 'issue_change_owner');
 
-			members as $t) 
@@ -418,19 +418,20 @@ $this->load->view (
 				$owner_array[$t] = $t;
 			}
 			if ($found === FALSE) $owner_array[$issue->owner] = $issue->owner;
-			?>
-			
-			owner),
-				'id="issue_change_owner"')
+				'id="issue_change_owner"');
 			?>
 		

 
 		

 			lang->line('Comment'), 'issue_change_comment')?>
 			lang->line('Preview')?>
+		

+		

 			 'issue_change_comment',
@@ -441,9 +442,9 @@ $this->load->view (
 				);
 				print form_textarea ($xdata);
 			?>
-
-			

 		

+
+		

 	
 
 
 
diff --git a/codepot/src/codepot/views/project_home.php b/codepot/src/codepot/views/project_home.php
index 3346cc4b..8447c026 100644
--- a/codepot/src/codepot/views/project_home.php
+++ b/codepot/src/codepot/views/project_home.php
@@ -21,6 +21,7 @@
 
 
 
+
 
 
 
 <?php print htmlspecialchars($project->name)?>
 
 
-
+
 
 

 
diff --git a/codepot/src/codepot/views/taskbar.php b/codepot/src/codepot/views/taskbar.php
index c29b5b96..df33e044 100644
--- a/codepot/src/codepot/views/taskbar.php
+++ b/codepot/src/codepot/views/taskbar.php
@@ -9,10 +9,10 @@ function show_taskbar ($con, $login)
 	if (isset($login['id']) && $login['id'] != '')
 	{
 		$title = (isset($login['email']) && $login['email'] != '')?
-			('title=' . htmlspecialchars($login['email'])): '';
+			htmlspecialchars($login['email']): '';
 
 		$hex = $con->converter->AsciiToHex (current_url());
-		print form_open("main/signout/{$hex}", array('id' => 'taskbar_signout_form'));
+		print form_open("main/signout/{$hex}", array('id' => 'taskbar_signinout_form'));
 
 		/*
 		// attempt to load the user icon regardless of its upload state.
@@ -32,28 +32,25 @@ function show_taskbar ($con, $login)
 		print $icon_src;
 		*/
 		$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $con->converter->AsciiToHex($login['id']));
-		print "";
+		print "";
 
-		print anchor ('user/home', htmlspecialchars($login['id']), $title);
+		print anchor ('user/home', htmlspecialchars($login['id']), array('title' => $title, 'id' => 'taskbar_user_title'));
 
 
 		print ' ';
-		print form_submit (
-			'login', 
-			$con->lang->line('Sign out'), 
-			'class="button" id="taskbar_signout_button"'
-		);
+		//print form_submit (
+		//	'login', 
+		//	$con->lang->line('Sign out'), 
+		//	'class="button" id="taskbar_signinout_button"'
+		//);
+		printf ('%s', $con->lang->line('Sign out'));
 		print form_close();
 	}
 	else
 	{
-
-//print '
';
-
-		print form_open('main/signin', array('id' => 'taskbar_signin_form'));
+		print form_open('main/signin', array('id' => 'taskbar_signinout_form'));
 
 		print form_fieldset();
-//print '
';
 
 		$user_name = "";
 		$user_pass = "";
@@ -73,7 +70,7 @@ function show_taskbar ($con, $login)
 		print form_input (
 			'user_name', 
 			set_value ('user_name', $user_name), 
-			"size='20' id='taskbar_user_name' placeholder={$con->lang->line('Username')}"
+			"size='16' id='taskbar_user_name' placeholder={$con->lang->line('Username')}"
 		);
 
 		print ' ';
@@ -87,28 +84,19 @@ function show_taskbar ($con, $login)
 		print form_password (
 			'user_pass',
 			set_value ('user_pass', $user_pass),
-			"size='20' id='taskbar_user_pass' placeholder={$con->lang->line('Password')}"
+			"size='16' id='taskbar_user_pass' placeholder={$con->lang->line('Password')}"
 		);
 
 		print ' ';
-		print form_submit (
-			'login', 
-			$con->lang->line('Sign in'), 
-			'class="button" id="taskbar_signin_button"'
-		);
-//print '
';
-
-//print '';
+		//print form_submit (
+		//	'login', 
+		//	$con->lang->line('Sign in'), 
+		//	'class="button" id="taskbar_signinout_button"'
+		//);
+		printf ('%s', $con->lang->line('Sign in'));
 
 		print form_fieldset_close();
 		print form_close();
-
-//print '
';
-
 	}
 	print '
'; // boxb
 
@@ -120,9 +108,9 @@ function show_taskbar ($con, $login)
 	print '
  • ';
 	print anchor ('project/catalog', $con->lang->line('Projects'));
 	print '
    • ';
-	print '
  • ';
-	print " ";
-	print '
    • ';
+	print '
  • ';
+	print " ";
+	print '
    • ';
 	if ($login['sysadmin?'])
 	{
 		print '
  • ';
@@ -130,6 +118,7 @@ function show_taskbar ($con, $login)
 		print '
    • ';
 	}
 	print '';
+
 	print '
    '; print '
    '; @@ -138,32 +127,46 @@ function show_taskbar ($con, $login) - +
    diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css index 711bf3dd..c6949af6 100644 --- a/codepot/src/css/common.css +++ b/codepot/src/css/common.css @@ -82,24 +82,13 @@ body { float: right; } -.content .taskbar .boxb .user_icon_img { - height: 2em; /* as large as line-height of taskbar */ - width: auto; - vertical-align: middle; - margin-right: 2px; - - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; -} - -.content .taskbar a { +.content .taskbar .boxa a { text-decoration: none; color: #FFFFFF; padding: 6px; } -.content .taskbar a:hover { +.content .taskbar .boxa a:hover { padding: 6px; background-color: #4472B9; color: #FFFFFF; @@ -109,88 +98,21 @@ body { border-radius: 3px; } -.content .taskbar a:active { +.content .taskbar .boxa a:active { text-decoration: none; } -.content .taskbar form { - margin: 0; - padding-right: 5px; -} - -.content .taskbar form input { -/* font-size: inherit; - font-family: inherit; - border: 0; - margin: 0; - padding: 0; -*/ - - -moz-box-shadow: 0 2px 4px #bbb inset; - -webkit-box-shadow: 0 2px 4px #BBB inset; - box-shadow: 0 2px 4px #BBB inset; - - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - - font-size: 1em; - border: 0 none; - height: 1.8em; - vertical-align: middle; -} - -.content .taskbar ul { +.content .taskbar .boxa ul { list-style-type: none; margin: 0; padding: 0; + white-space: nowrap; } -.content .taskbar ul li { +.content .taskbar .boxa ul li { display: inline; } - -.content .taskbar form input[type="text"] { -} - -.content .taskbar form input[type="password"] { -} - -.content .taskbar form input[type="submit"] { - cursor: pointer; - height: 1.8em; - vertical-align: middle; - padding-left: 5px; - padding-right: 5px; - text-transform: uppercase; - - background: #3498db; - background-image: -webkit-linear-gradient(top, #3498db, #2980b9); - background-image: -moz-linear-gradient(top, #3498db, #2980b9); - background-image: -ms-linear-gradient(top, #3498db, #2980b9); - background-image: -o-linear-gradient(top, #3498db, #2980b9); - background-image: linear-gradient(to bottom, #3498db, #2980b9); - -webkit-border-radius: 28; - -moz-border-radius: 28; - border-radius: 5px; - text-shadow: 1px 1px 3px #666666; - color: #ffffff; - text-decoration: none; - - font-size: 1em; - border: 0 none; -} - -.content .taskbar form input[type="submit"]:hover { - background: #3cb0fd; - background-image: -webkit-linear-gradient(top, #3cb0fd, #3498db); - background-image: -moz-linear-gradient(top, #3cb0fd, #3498db); - background-image: -ms-linear-gradient(top, #3cb0fd, #3498db); - background-image: -o-linear-gradient(top, #3cb0fd, #3498db); - background-image: linear-gradient(to bottom, #3cb0fd, #3498db); -} - .content .projectbar { /*margin: 0.1em 0em 0em 0em;*/ padding: 0.5em 0.5em 0.5em 0.5em; @@ -832,29 +754,7 @@ pre.prettyprint li.L9 { background: #eee } } /* === signin panel === */ -#taskbar_signin_panel { - position: absolute; - right: 0.8em; - top: 0.8em; -} - -#taskbar_signin_form_panel { - background-color: black; - padding: 0.6em 0.6em 0.6em 0.6em; - float: right; - white-space: nowrap; -} - -#taskbar_signin_button_panel { - float: right; - margin-left: 0.3em; -} - -#taskbar_signin_button_panel a { - color: #0073EA; -} - -#taskbar_signin_form fieldset { +#taskbar_signinout_form fieldset { margin: 0; padding: 0; border: 0; @@ -865,6 +765,7 @@ pre.prettyprint li.L9 { background: #eee } background: url("images/username.png") no-repeat scroll 0% 0% rgb(234, 231, 231); background-position: 0px 1px !important; padding-left: 24px; + text-align: left; } #taskbar_user_name:focus { @@ -876,6 +777,7 @@ pre.prettyprint li.L9 { background: #eee } background: url("images/password.png") no-repeat scroll 0% 0% rgb(234, 231, 231); background-position: 0px 1px !important; padding-left: 24px; + text-align: left; } #taskbar_user_pass:focus { @@ -883,13 +785,47 @@ pre.prettyprint li.L9 { background: #eee } outline: 0; } -/* -#taskbar_signin_button { +#taskbar_user_title { + text-decoration: none; + color: #FFFFFF; + padding: 6px; } -#taskbar_signout_button { +#taskbar_user_title:hover { + padding: 6px; + background-color: #4472B9; + color: #FFFFFF; + + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +#taskbar_user_title:active { + text-decoration: none; +} + +#taskbar_user_icon { + height: 2em; /* as large as line-height of taskbar */ + width: auto; + vertical-align: middle; + margin-right: 2px; + + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} +#taskbar_project_to_find { + text-align: left; +} + +#taskbar_signinout_button { + +} + +#taskbar_signinout_button .ui-button-text { + line-height: 1em; } -*/ /* ================ login page =================== */ diff --git a/codepot/src/css/images/Makefile.am b/codepot/src/css/images/Makefile.am index 16e24e9e..66e7e585 100644 --- a/codepot/src/css/images/Makefile.am +++ b/codepot/src/css/images/Makefile.am @@ -65,6 +65,7 @@ www_DATA = \ ui-icons_ef8c08_256x240.png \ ui-icons_228ef1_256x240.png \ ui-icons_222222_256x240.png \ + ui-anim_basic_16x16.gif \ up.png \ username.png diff --git a/codepot/src/css/images/Makefile.in b/codepot/src/css/images/Makefile.in index 6f999b4d..bd4391a6 100644 --- a/codepot/src/css/images/Makefile.in +++ b/codepot/src/css/images/Makefile.in @@ -264,6 +264,7 @@ www_DATA = \ ui-icons_ef8c08_256x240.png \ ui-icons_228ef1_256x240.png \ ui-icons_222222_256x240.png \ + ui-anim_basic_16x16.gif \ up.png \ username.png diff --git a/codepot/src/css/images/ui-anim_basic_16x16.gif b/codepot/src/css/images/ui-anim_basic_16x16.gif new file mode 100644 index 00000000..085ccaec Binary files /dev/null and b/codepot/src/css/images/ui-anim_basic_16x16.gif differ diff --git a/codepot/src/css/issue.css b/codepot/src/css/issue.css index ea547aa4..1340789b 100644 --- a/codepot/src/css/issue.css +++ b/codepot/src/css/issue.css @@ -179,11 +179,12 @@ font-size: 1em; } + /* all these elements inside the form requires a lot of refinement. * many of these are duplicates of elemenents in common.css */ #issue_change_form .form_input_preview { background-color: #FFFFF0; - font-size: 0.9em; + font-size: 1em; padding: 0.2em 0.2em 0.2em 0.2em; margin-bottom: 0.5em; } @@ -194,10 +195,24 @@ #issue_change_form .form_input_preview pre { background-color: #F8F8FA; - padding: 0.2em 0.2em 0.2em 0.2em; + /*padding: 0.2em 0.2em 0.2em 0.2em;*/ + + background-color: #F8F8FA; + border: none; + font-family: consolas, "Andale Mono", monospace; + line-height: 1.2em; + padding: 0.3em; + + tab-size: 5; + -moz-tab-size: 5; + -o-tab-size: 5; + + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } -#issue_change_comment_preview_button { +#issue_change_comment_preview_button.ui-button { font-size: 0.8em; } diff --git a/codepot/src/css/jquery-ui.css b/codepot/src/css/jquery-ui.css index 8f8e9b86..78fb1243 100644 --- a/codepot/src/css/jquery-ui.css +++ b/codepot/src/css/jquery-ui.css @@ -162,7 +162,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; } .ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; } .ui-menu .ui-menu-item a.ui-state-focus, -.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; } +.ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; /*margin: -1px;*/ background: #fdf5ce url("images//ui-bg_highlight-soft_75_ffe45c_1x100.png") 50% 50% repeat-x;} .ui-menu .ui-state-disabled { font-weight: normal; margin: .4em 0 .2em; line-height: 1.5; } .ui-menu .ui-state-disabled a { cursor: default; } @@ -229,8 +229,10 @@ body .ui-tooltip { border-width: 2px; } /* Component containers ----------------------------------*/ .ui-widget { font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 0.9em; } -.ui-widget .ui-widget { font-size: 0.8em; } -.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 0.8em; } +.ui-widget .ui-widget { font-size: 0.9em; } +.ui-widget input, .ui-widget select, .ui-widget button { font-family: Trebuchet MS,Tahoma,Verdana,Arial,sans-serif; font-size: 0.9em; } +.ui-widget textarea { font-family: consolas, "Andale Mono", monospace; font-size: 0.9em; padding: 0.2em 0.2em 0.2em 0.2em} + .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 a { color: #333333; } .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; } @@ -240,9 +242,8 @@ body .ui-tooltip { border-width: 2px; } ----------------------------------*/ .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url("images/ui-bg_glass_100_f6f6f6_1x400.png") 50% 50% repeat-x; font-weight: bold; color: #1c94c4; } .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; } -/*.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url("images/ui-bg_glass_100_fdf5ce_1x400.png") 50% 50% repeat-x; font-weight: bold; color: #c77405; } -.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #c77405; text-decoration: none; } -*/ +/*.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #fbcb09; background: #fdf5ce url("images/ui-bg_glass_100_fdf5ce_1x400.png") 50% 50% repeat-x; font-weight: bold; color: #c77405; } +.ui-state-hover a, .ui-state-hover a:hover, .ui-state-hover a:link, .ui-state-hover a:visited { color: #c77405; text-decoration: none; } */ .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #fbd850; 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; } @@ -461,3 +462,5 @@ body .ui-tooltip { border-width: 2px; } /* Overlays */ .ui-widget-overlay { background: #666666 url("images/ui-bg_diagonals-thick_20_666666_40x40.png") 50% 50% repeat; opacity: .5;filter:Alpha(Opacity=50); } .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: .2;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -khtml-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; } + +.ui-autocomplete-loading { background: white url("images/ui-anim_basic_16x16.gif") right center no-repeat; }