hyung-hwan/codepot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

# added project/search_json to support the quick project finder on the top taskbar.

Browse Source 
# adjusted some styles in jquery-ui.css
# changed some view files to use $(function() {}) instread of "body onload=".
# fixed a bug of showing some garbages in the diff view - it showed property changes before this fix
This commit is contained in:
hyung-hwan 2015-04-15 17:01:01 +00:00
parent e88282f081
commit 94e8bddd46
27 changed files with 366 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
codepot/src/codepot/controllers/main.php
View File

@ -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');

31
codepot/src/codepot/controllers/project.php
View File

@ -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);
}
}
?>

1
codepot/src/codepot/language/english/common_lang.php
View File

@ -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';

1
codepot/src/codepot/language/indonesian/common_lang.php
View File

@ -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';

1
codepot/src/codepot/language/korean/common_lang.php
View File

@ -69,6 +69,7 @@ $lang['Path'] = '경로';
$lang['Preview'] = '미리보기';
$lang['Priority'] = '중요도';
$lang['Project'] = '프로젝트';
$lang['Project ID'] = '프로젝트 아이디';
$lang['Projects'] = '프로젝트';
$lang['Public'] = '공개';
$lang['Purge'] = '정화하기';

12
codepot/src/codepot/models/projectmodel.php
View File

@ -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)
{

42
codepot/src/codepot/models/subversionmodel.php
View File

@ -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--;
@ -527,7 +556,6 @@ class SubversionModel extends Model
$listing[$index]["rev1line"] = '';
}
if (!feof($nfile))
{
$line = rtrim(fgets($nfile), "\r\n");

4
codepot/src/codepot/views/code_blame.php
View File

@ -47,6 +47,8 @@ $(function () {
"option", "label", "<?php print $this->lang->line('Hide details')?>");
}
});
prettyPrint ();
});
</script>
@ -58,7 +60,7 @@ $(function () {
?></title>
</head>
<body onload="prettyPrint()">
<body>
<div class="content" id="code_blame_content">

9
codepot/src/codepot/views/code_diff.php
View File

@ -16,6 +16,12 @@
<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" />
<script type="text/javascript">
$(function() {
prettyPrint();
});
</script>
<title><?php
if ($headpath == '')
printf ('%s', htmlspecialchars($project->name));
@ -24,7 +30,7 @@
?></title>
</head>
<body onload="prettyPrint()">
<body>
<div class="content" id="code_diff_content">
@ -443,7 +449,6 @@ else
printf ("</div>");
print '</pre>';
print ("<div style='float:left; width: 49%;'>");
print "<div class='navigator'>";

10
codepot/src/codepot/views/code_file.php
View File

@ -31,9 +31,7 @@ $(function () {
else
btn_label = "<?php print $this->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", "<?php print $this->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()
?></title>
</head>
<body onload="renderCode()">
<body>
<div class="content" id="code_file_content">

54
codepot/src/codepot/views/code_folder.php
View File

@ -141,8 +141,26 @@ function show_loc_graph (response)
//$("#code_folder_mainarea_result_info_loc_progress" ).progressbar().hide();
}
<?php if ($file_count > 0): ?>
function render_readme()
{
<?php
// if the readme file name ends with '.wiki', perform pretty printing
if (strlen($readme_text) > 0 && substr_compare($readme_file, '.wiki', -5) === 0):
?>
creole_render_wiki (
"code_folder_mainarea_result_readme_text",
"code_folder_mainarea_result_readme",
"<?php print site_url()?>/wiki/show/<?php print $project->id?>/",
"<?php print site_url()?>/wiki/attachment0/<?php print $project->id?>/"
);
prettyPrint();
<?php endif; ?>
}
$(function () {
<?php if ($file_count > 0): ?>
<?php
if ($login['settings'] != NULL && $login['settings']->code_hide_details == 'Y')
print '$("#code_folder_mainarea_result_info").hide();';
@ -189,33 +207,22 @@ $(function () {
});
//$("#code_folder_mainarea_result_info_loc_progress" ).progressbar().hide();
});
<?php endif; ?>
function renderReadme()
$('#code_folder_search_submit').button().click (function (e) {
if ($.trim($("#code_folder_search_string").val()) != "")
{
<?php
// if the readme file name ends with '.wiki', perform pretty printing
if (strlen($readme_text) > 0 && substr_compare($readme_file, '.wiki', -5) === 0):
?>
creole_render_wiki (
"code_folder_mainarea_result_readme_text",
"code_folder_mainarea_result_readme",
"<?php print site_url()?>/wiki/show/<?php print $project->id?>/",
"<?php print site_url()?>/wiki/attachment0/<?php print $project->id?>/"
);
prettyPrint();
<?php endif; ?>
$('#code_folder_search_form').submit ();
}
function hookSearchSubmit()
{
});
/*
$('#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 ();
});
</script>
@ -235,7 +244,7 @@ function hookSearchSubmit()
?></title>
</head>
<body onload="hookSearchSubmit(); renderReadme();">
<body>
<div class="content" id="code_folder_content">
@ -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 ('<a id="code_folder_search_submit" href="#">%s</a>', $this->lang->line('Search'));
print ' | ';
}

12
codepot/src/codepot/views/code_revision.php
View File

@ -172,10 +172,6 @@ $(function() {
});
<?php endif; ?>
</script>
<script type="text/javascript">
function render_wiki()
{
creole_render_wiki (
@ -207,6 +203,12 @@ function hide_unneeded_divs()
var nrows = $('#code_revision_mainarea_result_properties_table tr').length;
if (nrows <= 0) $('#code_revision_mainarea_result_properties').hide();
}
$(function() {
hide_unnddeded_divs ();
render_wiki ();
});
</script>
<title><?php
@ -217,7 +219,7 @@ function hide_unneeded_divs()
?></title>
</head>
<body onload="hide_unneeded_divs(); render_wiki();">
<body>
<div class="content" id="code_revision_content">

25
codepot/src/codepot/views/code_search.php
View File

@ -19,15 +19,23 @@
<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" />
<script>
function hookSearchSubmit()
<script type="text/javascript">
$(function() {
$('#code_search_search_submit').button().click (function (e) {
if ($.trim($("#code_search_search_string").val()) != "")
{
$('#code_search_search_form').submit ();
}
});
/*
$('#code_search_search_form').submit (function(e) {
if ($.trim($("#code_search_search_string").val()) === "")
{
// prevent submission when the search string is empty.
e.preventDefault();
}
});
});*/
$('#code_search_invertedly').button();
$('#code_search_case_insensitively').button();
@ -35,8 +43,11 @@ function hookSearchSubmit()
$('#code_search_in_name').button();
$('#code_search_is_regex').button();
$('.code_search_option').tooltip();
}
prettyPrint();
});
</script>
<?php
$file_count = count($file['content']);
?>
@ -49,7 +60,7 @@ function hookSearchSubmit()
?></title>
</head>
<body onload="hookSearchSubmit(); prettyPrint()">
<body>
<div class="content" id="code_search_content">
@ -194,7 +205,8 @@ $this->load->view (
);
print ' ';
print form_submit ('search_submit', $this->lang->line('Search'), 'id="code_search_search_submit"');
printf ('<a id="code_search_search_submit" href="#">%s</a>', $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 '</div>';
print '<pre class="prettyprint">';
if ($in_name)
{

5
codepot/src/codepot/views/error.php
View File

@ -6,6 +6,11 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/project.css')?>" />
<script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" />
<title><?php print $title?></title>
</head>

27
codepot/src/codepot/views/file_show.php
View File

@ -20,6 +20,18 @@
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" />
<script type="text/javascript">
function render_wiki()
{
creole_render_wiki (
"file_show_mainarea_wiki_text",
"file_show_mainarea_wiki",
"<?php print site_url()?>/wiki/show/<?php print $project->id?>/",
"<?php print site_url()?>/wiki/attachment0/<?php print $project->id?>/"
);
prettyPrint ();
}
$(function () {
if ($("#file_show_mainarea_result_info").is(":visible"))
btn_label = "<?php print $this->lang->line('Hide details')?>";
@ -42,25 +54,16 @@ $(function () {
"option", "label", "<?php print $this->lang->line('Hide details')?>");
}
});
render_wiki ();
});
function render_wiki()
{
creole_render_wiki (
"file_show_mainarea_wiki_text",
"file_show_mainarea_wiki",
"<?php print site_url()?>/wiki/show/<?php print $project->id?>/",
"<?php print site_url()?>/wiki/attachment0/<?php print $project->id?>/"
);
prettyPrint ();
}
</script>
<title><?php print htmlspecialchars($project->name)?> - <?php print htmlspecialchars($file->name)?></title>
</head>
<body onload="render_wiki()">
<body>
<div class="content" id="file_show_content">

4
codepot/src/codepot/views/graph_main.php
View File

@ -28,6 +28,10 @@
<script type="text/javascript" src="<?php print base_url_make('/js/jquery.flot.stack.min.js')?>"></script>
<script type="text/javascript" src="<?php print base_url_make('/js/jquery.flot.tickrotor.js')?>"></script>
<script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" />
<script type="text/javascript">
function show_tooltip(id, x, y, contents) {
$('<div id="' + id + '">' + contents + '</div>').css( {

4
codepot/src/codepot/views/issue_delete.php
View File

@ -6,6 +6,10 @@
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/common.css')?>" />
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/issue.css')?>" />
<script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" />
<title><title><?php print htmlspecialchars($issue->id)?></title></title>
</head>

19
codepot/src/codepot/views/issue_show.php
View File

@ -154,13 +154,15 @@ $(function () {
render_wiki_comment_preview ($("#issue_change_comment").val());
}
);
render_wiki();
});
</script>
<title><?php print htmlspecialchars($project->name)?> - <?php print $this->lang->line('Issue')?> <?php print htmlspecialchars($issue->id)?></title>
</head>
<body onload="render_wiki()">
<body>
<div class="content" id="issue_show_content">
@ -405,11 +407,9 @@ $this->load->view (
</div>
<div>
<?php print form_label ($this->lang->line('Owner'),
'issue_change_owner')
?>
<?php
print form_label ($this->lang->line('Owner'), 'issue_change_owner');
$owner_array = array ();
$found = FALSE;
foreach ($project->members as $t)
@ -418,19 +418,20 @@ $this->load->view (
$owner_array[$t] = $t;
}
if ($found === FALSE) $owner_array[$issue->owner] = $issue->owner;
?>
<?php print form_dropdown (
print form_dropdown (
'issue_change_owner',
$owner_array,
set_value('issue_change_owner', $issue->owner),
'id="issue_change_owner"')
'id="issue_change_owner"');
?>
</div>
<div>
<?php print form_label ($this->lang->line('Comment'), 'issue_change_comment')?>
<a href='#' id='issue_change_comment_preview_button'><?php print $this->lang->line('Preview')?></a>
</div>
<div>
<?php
$xdata = array (
'name' => 'issue_change_comment',
@ -441,9 +442,9 @@ $this->load->view (
);
print form_textarea ($xdata);
?>
</div>
<div id='issue_change_comment_preview' class='form_input_preview'></div>
</div>
<?php print form_close()?>
</div> <!-- issue_show_change_form -->

7
codepot/src/codepot/views/project_home.php
View File

@ -21,6 +21,7 @@
<script type="text/javascript" src="<?php print base_url_make('/js/jquery.min.js')?>"></script>
<script type="text/javascript" src="<?php print base_url_make('/js/jquery-ui.min.js')?>"></script>
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" />
<script type="text/javascript">
function render_wiki()
@ -34,12 +35,16 @@ function render_wiki()
prettyPrint ();
}
$(function() {
render_wiki ();
});
</script>
<title><?php print htmlspecialchars($project->name)?></title>
</head>
<body onload="render_wiki()">
<body>
<div class="content" id="project_home_content">

107
codepot/src/codepot/views/taskbar.php
View File

@ -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 "<img src='{$user_icon_url}' class='user_icon_img' />";
print "<img src='{$user_icon_url}' class='user_icon_img' id='taskbar_user_icon'/>";
print anchor ('user/home', htmlspecialchars($login['id']), $title);
print anchor ('user/home', htmlspecialchars($login['id']), array('title' => $title, 'id' => 'taskbar_user_title'));
print '&nbsp;';
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 ('<a href="#" id="taskbar_signinout_button">%s</a>', $con->lang->line('Sign out'));
print form_close();
}
else
{
//print '<div id="taskbar_signin_panel">';
print form_open('main/signin', array('id' => 'taskbar_signin_form'));
print form_open('main/signin', array('id' => 'taskbar_signinout_form'));
print form_fieldset();
//print '<div id="taskbar_signin_form_panel">';
$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 '&nbsp;';
@ -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 '&nbsp;';
print form_submit (
'login',
$con->lang->line('Sign in'),
'class="button" id="taskbar_signin_button"'
);
//print '</div>';
//print '<div id="taskbar_signin_button_panel">';
// print '<a href="#" id="taskbar_signin_button">';
// print $con->lang->line('Sign in');
// print '</a>';
//print '</div>';
//print form_submit (
// 'login',
// $con->lang->line('Sign in'),
// 'class="button" id="taskbar_signinout_button"'
//);
printf ('<a href="#" id="taskbar_signinout_button">%s</a>', $con->lang->line('Sign in'));
print form_fieldset_close();
print form_close();
//print '</div>';
}
print '</div>'; // boxb
@ -120,9 +108,9 @@ function show_taskbar ($con, $login)
print '<li>';
print anchor ('project/catalog', $con->lang->line('Projects'));
print '</li>';
print '<li>';
print " <input id='taskbar_project_to_find' placeholder='Project ID'>";
print '</li>';
print '<li><span class="ui-widget">';
print " <input id='taskbar_project_to_find' placeholder='{$con->lang->line('Project ID')}' size=40>";
print '</span></li>';
if ($login['sysadmin?'])
{
print '<li>';
@ -130,6 +118,7 @@ function show_taskbar ($con, $login)
print '</li>';
}
print '</ul>';
print '</div>';
print '</div>';
@ -138,32 +127,46 @@ function show_taskbar ($con, $login)
<script type="text/javascript">
$(function () {
/*
$("#taskbar_signin_form_panel").hide();
btn_label = "<?php print $this->lang->line('Sign in')?>";
btn = $("#taskbar_signin_button").button({"label": btn_label}).click (function () {
if ($("#taskbar_signin_form_panel").is(":visible"))
function ready_to_signinout()
{
$("#taskbar_signin_form_panel").hide("slide",{direction: 'right'},200);
<?php if (isset($login['id']) && $login['id'] != ''): ?>
// signed in already. can signout anytime.
return true;
<?php else: ?>
// not signed-in yet. both username and password must be filled.
return $("#taskbar_user_name").val() != "" && $("#taskbar_user_pass").val();
<?php endif; ?>
}
else
{
$("#taskbar_signin_form_panel").show("slide",{direction: 'right'},200);
$(function () {
$("#taskbar_user_name").button().bind ('keyup', function(e) {
if (e.keyCode == 13) {
if (ready_to_signinout()) $("#taskbar_signinout_form").submit();
}
});
$("#taskbar_user_pass").button().bind ('keyup', function(e) {
if (e.keyCode == 13) {
if (ready_to_signinout()) $("#taskbar_signinout_form").submit();
}
});
$("#taskbar_signin_ok_button").button();*/
$("#taskbar_signinout_button").button().click (function() {
if (ready_to_signinout()) $("#taskbar_signinout_form").submit();
});
$("#taskbar_project_to_find").autocomplete({
source: "search.php",
minLength: 2,
$("#taskbar_project_to_find").button().autocomplete({
minLength: 1, // is this too small?
source: function (request, response) {
$.ajax({
url: "<?php print site_url(); ?>/project/search_json/" + request.term,
dataType: "json",
success: function(data) { response(data); },
});
},
select: function( event, ui ) {
/* TODO: move to the project page */
/*log( ui.item ?
"Selected: " + ui.item.value + " aka " + ui.item.id :
"Nothing selected, input was " + this.value );*/
$(location).attr ('href', "<?php print site_url(); ?>/project/home/" + ui.item.id);
//ui.item.value , ui.item.id , this.value );
}
});
});

51
codepot/src/codepot/views/wiki_show.php
View File

@ -29,30 +29,6 @@ $hexname = $this->converter->AsciiToHex ($wiki->name);
?>
<script type="text/javascript">
$(function () {
if ($("#wiki_show_mainarea_result_info").is(":visible"))
btn_label = "<?php print $this->lang->line('Hide details')?>";
else
btn_label = "<?php print $this->lang->line('Show details')?>";
btn = $("#wiki_show_mainarea_details_button").button({"label": btn_label}).click (function () {
if ($("#wiki_show_mainarea_result_info").is(":visible"))
{
$("#wiki_show_mainarea_result_info").hide("blind",{},200);
$("#wiki_show_mainarea_details_button").button(
"option", "label", "<?php print $this->lang->line('Show details')?>");
}
else
{
$("#wiki_show_mainarea_result_info").show("blind",{},200);
$("#wiki_show_mainarea_details_button").button(
"option", "label", "<?php print $this->lang->line('Hide details')?>");
}
});
});
function render_wiki()
{
var column_count = '<?php print $wiki->columns ?>';
@ -77,9 +53,34 @@ function render_wiki()
prettyPrint ();
}
$(function () {
if ($("#wiki_show_mainarea_result_info").is(":visible"))
btn_label = "<?php print $this->lang->line('Hide details')?>";
else
btn_label = "<?php print $this->lang->line('Show details')?>";
btn = $("#wiki_show_mainarea_details_button").button({"label": btn_label}).click (function () {
if ($("#wiki_show_mainarea_result_info").is(":visible"))
{
$("#wiki_show_mainarea_result_info").hide("blind",{},200);
$("#wiki_show_mainarea_details_button").button(
"option", "label", "<?php print $this->lang->line('Show details')?>");
}
else
{
$("#wiki_show_mainarea_result_info").show("blind",{},200);
$("#wiki_show_mainarea_details_button").button(
"option", "label", "<?php print $this->lang->line('Hide details')?>");
}
});
render_wiki ();
});
</script>
<body onload="render_wiki()">
<body>
<div class="content" id="wiki_show_content">

158
codepot/src/css/common.css
View File

@ -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 =================== */

1
codepot/src/css/images/Makefile.am
View File

@ -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

1
codepot/src/css/images/Makefile.in
View File

@ -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

BIN
codepot/src/css/images/ui-anim_basic_16x16.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

21
codepot/src/css/issue.css
View File

@ -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;
}

13
codepot/src/css/jquery-ui.css vendored
View File

@ -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; }
@ -241,8 +243,7 @@ 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 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; }