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

renewed the code file view and the code blame view

Browse Source
This commit is contained in:
hyung-hwan 2016-01-08 20:26:01 +00:00
parent 14bae4bc93
commit ee01b4d92c
6 changed files with 462 additions and 328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,35 +23,78 @@
<link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" /> <link type="text/css" rel="stylesheet" href="<?php print base_url_make('/css/jquery-ui.css')?>" />
<?php
$hex_headpath = $this->converter->AsciiToHex ($headpath);
if ($revision <= 0)
{
$revreq = '';
$revreqroot = '';
$history_path = "/code/history/{$project->id}/{$hex_headpath}";
}
else
{
$revreq = "/{$file['created_rev']}";
$revreqroot = '/' . $this->converter->AsciiToHex ('.') . $revreq;
if ($hex_headpath == '') $revtrailer = $revreqroot;
else $revtrailer = "/{$hex_headpath}{$revreq}";
$history_path = "/code/history/{$project->id}{$revtrailer}";
}
?>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
<?php
if ($login['settings'] != NULL && $login['settings']->code_hide_metadata == 'Y')
print '$("#code_blame_mainarea_result_info").hide();';
?>
if ($("#code_blame_mainarea_result_info").is(":visible")) $('#code_blame_mainarea_metadata').accordion({
btn_label = "<?php print $this->lang->line('Hide metadata')?>"; collapsible: true
else });
btn_label = "<?php print $this->lang->line('Show metadata')?>";
$("#code_blame_mainarea_loc_info").hide();
btn = $("#code_blame_mainarea_metadata_button").button({"label": btn_label}).click (function () { btn = $("#code_blame_mainarea_loc_button").button().click (function () {
if ($("#code_blame_mainarea_loc_info").is(":visible"))
if ($("#code_blame_mainarea_result_info").is(":visible"))
{ {
$("#code_blame_mainarea_result_info").hide("blind",{},200); $("#code_blame_mainarea_loc_info").hide("blind",{},200);
$("#code_blame_mainarea_metadata_button").button(
"option", "label", "<?php print $this->lang->line('Show metadata')?>");
} }
else else
{ {
$("#code_blame_mainarea_result_info").show("blind",{},200); $("#code_blame_mainarea_loc_info").show("blind",{},200);
$("#code_blame_mainarea_metadata_button").button(
"option", "label", "<?php print $this->lang->line('Hide metadata')?>");
} }
return false; // prevent the default behavior
}); });
$("#code_blame_mainarea_edit_button").button(); $("#code_blame_mainarea_edit_button").button();
<?php if ($file['created_rev'] != $file['head_rev']): ?>
$("#code_blame_mainarea_headrev_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/blame/{$project->id}/${hex_headpath}"; ?>'));
return false;
});
<?php endif; ?>
$("#code_blame_mainarea_detail_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/file/{$project->id}/${hex_headpath}{$revreq}"; ?>'));
return false;
});
$("#code_blame_mainarea_diff_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/diff/{$project->id}/${hex_headpath}{$revreq}"; ?>'));
return false;
});
$("#code_blame_mainarea_fulldiff_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/fulldiff/{$project->id}/${hex_headpath}{$revreq}"; ?>'));
return false;
});
$("#code_blame_mainarea_history_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print $history_path; ?>'));
return false;
});
$("#code_blame_mainarea_download_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/fetch/{$project->id}/${hex_headpath}{$revreq}"; ?>'));
return false;
});
prettyPrint (); prettyPrint ();
}); });
</script> </script>
@ -95,95 +138,48 @@ $this->load->view (
<div class="mainarea" id="code_blame_mainarea"> <div class="mainarea" id="code_blame_mainarea">
<div class="title" id="code_blame_mainarea_title"> <div class="title-band" id="code_blame_mainarea_title_band">
<?php
if ($revision <= 0)
{
$revreq = '';
$revreqroot = '';
}
else
{
$revreq = "/{$file['created_rev']}";
$revreqroot = '/' . $this->converter->AsciiToHex ('.') . $revreq;
}
print anchor ( <div class="title" id="code_blame_mainarea_title">
"code/file/{$project->id}{$revreqroot}", <?php
htmlspecialchars($project->name)); print anchor (
"code/file/{$project->id}{$revreqroot}",
htmlspecialchars($project->name));
$exps = explode ('/', $headpath); $exps = explode ('/', $headpath);
$expsize = count($exps); $expsize = count($exps);
$par = ''; $par = '';
for ($i = 1; $i < $expsize; $i++) for ($i = 1; $i < $expsize; $i++)
{
$par .= '/' . $exps[$i];
$xpar = $this->converter->AsciiToHex ($par);
print '/';
if ($i == $expsize - 1)
{ {
print anchor ( $par .= '/' . $exps[$i];
"code/blame/{$project->id}/{$xpar}{$revreq}", $xpar = $this->converter->AsciiToHex ($par);
htmlspecialchars($exps[$i]));
print '/';
if ($i == $expsize - 1)
{
print anchor (
"code/blame/{$project->id}/{$xpar}{$revreq}",
htmlspecialchars($exps[$i]));
}
else
{
print anchor (
"code/file/{$project->id}/{$xpar}{$revreq}",
htmlspecialchars($exps[$i]));
}
} }
else
if ($headpath != $file['fullpath'])
{ {
print anchor ( print ' - ';
"code/file/{$project->id}/{$xpar}{$revreq}", print htmlspecialchars($file['fullpath']);
htmlspecialchars($exps[$i]));
} }
} ?>
</div> <!-- code_blame_mainarea_title -->
if ($headpath != $file['fullpath']) <div class="actions">
{ <?php
print ' - '; print anchor ("code/blame/{$project->id}/{$hex_headpath}/{$file['prev_rev']}", '<i class="fa fa-arrow-circle-left"></i>');
print htmlspecialchars($file['fullpath']);
}
?>
</div> <!-- code_blame_mainarea_title -->
<div class="menu" id="code_blame_mainarea_menu">
<?php
$history_anchor_text = '<i class="fa fa-history"></i> ' . $this->lang->line('History');
$download_anchor_text = '<i class="fa fa-download"></i> ' . $this->lang->line('Download');
$diff_anchor_text = '<i class="fa fa-server"></i> ' . $this->lang->line('Difference');
$xpar = $this->converter->AsciiToHex ($headpath);
if ($file['created_rev'] != $file['head_rev'])
{
$head_revision_text = '<i class="fa fa-exclamation-triangle" style="color:#CC2222"></i> ' . $this->lang->line('Head revision');
print anchor ("code/blame/{$project->id}/${xpar}", $head_revision_text);
print ' | ';
}
print anchor ("code/file/{$project->id}/${xpar}{$revreq}", $this->lang->line('Details'));
print ' | ';
print anchor ("code/diff/{$project->id}/{$xpar}{$revreq}", $diff_anchor_text);
print ' | ';
if ($revision > 0)
{
if ($xpar == '') $revtrailer = $revreqroot;
else $revtrailer = "/{$xpar}{$revreq}";
print anchor ("code/history/{$project->id}{$revtrailer}", $history_anchor_text);
}
else
{
print anchor ("code/history/{$project->id}/{$xpar}", $history_anchor_text);
}
print ' | ';
print anchor ("code/fetch/{$project->id}/${xpar}{$revreq}", $download_anchor_text);
?>
</div> <!-- code_blame_mainarea_menu -->
<div class="infostrip" id="code_blame_mainarea_infostrip">
<?php
print anchor ("code/blame/{$project->id}/${xpar}/{$file['prev_rev']}", '<i class="fa fa-arrow-circle-left"></i>');
print ' '; print ' ';
// anchor to the revision history at the root directory // anchor to the revision history at the root directory
@ -200,7 +196,7 @@ print anchor ("code/fetch/{$project->id}/${xpar}{$revreq}", $download_anchor_tex
print ('</span>'); print ('</span>');
} }
print ' '; print ' ';
print anchor ("code/blame/{$project->id}/${xpar}/{$file['next_rev']}", '<i class="fa fa-arrow-circle-right"></i>'); print anchor ("code/blame/{$project->id}/{$hex_headpath}/{$file['next_rev']}", '<i class="fa fa-arrow-circle-right"></i>');
print ' | '; print ' | ';
printf ('%s: %s', $this->lang->line('Size'), $file['size']); printf ('%s: %s', $this->lang->line('Size'), $file['size']);
@ -208,10 +204,77 @@ print anchor ("code/fetch/{$project->id}/${xpar}{$revreq}", $download_anchor_tex
if ((isset($login['id']) && $login['id'] != '')) if ((isset($login['id']) && $login['id'] != ''))
{ {
print ' '; print ' ';
print anchor ("code/bledit/{$project->id}/{$xpar}{$revreq}", $this->lang->line('Edit'), 'id="code_blame_mainarea_edit_button"'); print anchor ("code/bledit/{$project->id}/{$hex_headpath}{$revreq}", $this->lang->line('Edit'), 'id="code_blame_mainarea_edit_button"');
} }
print anchor ("#", "LOC", "id=code_blame_mainarea_loc_button");
?>
</div>
<div style="clear: both;"></div>
</div>
<div id='code_blame_mainarea_metadata' class='collapsible-box'>
<div id='code_blame_mainarea_metadata_header' class='collapsible-box-header'>
<?php
print '<div class="metadata-committer">';
$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($file['last_author']));
print "<img src='{$user_icon_url}' class='metadata-committer-icon' />";
print htmlspecialchars ($file['last_author']);
print '</div>';
print '<div class="metadata-menu">';
$detail_anchor_text = $this->lang->line('Details');
$history_anchor_text = '<i class="fa fa-history"></i> ' . $this->lang->line('History');
$download_anchor_text = '<i class="fa fa-download"></i> ' . $this->lang->line('Download');
$diff_anchor_text = '<i class="fa fa-server"></i> ' . $this->lang->line('Difference');
$fulldiff_anchor_text = '<i class="fa fa-tasks"></i> ' . $this->lang->line('Full Difference');
if ($file['created_rev'] != $file['head_rev'])
{
$head_revision_text = '<i class="fa fa-exclamation-triangle" style="color:#CC2222"></i> ' . $this->lang->line('Head revision');
print anchor ('#', $head_revision_text, 'id="code_blame_mainarea_headrev_button"');
}
print anchor ('#', $detail_anchor_text, 'id="code_blame_mainarea_detail_button"');
print anchor ('#', $diff_anchor_text, 'id="code_blame_mainarea_diff_button"');
print anchor ('#', $fulldiff_anchor_text, 'id="code_blame_mainarea_fulldiff_button"');
print anchor ('#', $history_anchor_text, 'id="code_blame_mainarea_history_button"');
print anchor ('#', $download_anchor_text, 'id="code_blame_mainarea_download_button"');
print '</div>';
print '<div class="metadata-commit-date">';
printf ('[%s] ', $file['created_rev']);
print strftime ('%Y-%m-%d %H:%M:%S %z', $file['time_t']);
print '</div>';
?> ?>
<a id="code_blame_mainarea_metadata_button" href='#'><?php print $this->lang->line('Metadata')?></a> <div style='clear: both'></div>
</div>
<div id='code_blame_mainarea_metadata_body'>
<pre class='pre-wrapped'><?php print htmlspecialchars ($file['logmsg']); ?></pre>
<?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0)
{
print '<ul id="code_blame_mainarea_loc_info_property_list">';
foreach ($file['properties'] as $pn => $pv)
{
print '<li>';
print htmlspecialchars($pn);
if ($pv != '')
{
print ' - ';
print htmlspecialchars($pv);
}
print '</li>';
}
print '</ul>';
}
?>
</div>
</div> </div>
<div class="result" id="code_blame_mainarea_result"> <div class="result" id="code_blame_mainarea_result">
@ -259,7 +322,7 @@ if ($login['settings'] != NULL &&
$rev_to_show = $rev; $rev_to_show = $rev;
$xpar = $this->converter->AsciiTohex ($headpath); $xpar = $this->converter->AsciiTohex ($headpath);
$rev_to_show = anchor ("code/blame/{$project->id}/{$xpar}/{$rev}", $rev_to_show); $rev_to_show = anchor ("code/blame/{$project->id}/{$hex_headpath}/{$rev}", $rev_to_show);
} }
else else
{ {
@ -340,41 +403,15 @@ if ($login['settings'] != NULL &&
?> ?>
</pre> </pre>
<div id="code_blame_mainarea_result_info" class="infobox"> <div id="code_blame_mainarea_loc_info" class="infobox">
<div class="title"><?php print $this->lang->line('CODE_COMMIT') ?></div> <div class="title">LOC</div>
<ul> <?php
<li><?php printf ($this->lang->line('CODE_MSG_COMMITTED_BY_ON'), $file['last_author'], $file['time']); ?></li> /* TODO: show this if it's enabled in the user settings */
</ul> $graph_url = codepot_merge_path (site_url(), "/code/graph/cloc-file/{$project->id}/{$hex_headpath}{$revreq}");
print "<img src='{$graph_url}' id='code_blame_mainarea_loc_info_locgraph' />";
?>
<div class="title"><?php print $this->lang->line('Message') ?></div> </div>
<pre id="code_blame_mainarea_result_info_logmsg" class="pre-wrapped"> </div> <!-- code_blame_mainarea_loc_info -->
<?php print $file['logmsg'] ?>
</pre>
<?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0)
{
print '<div class="title">';
print $this->lang->line('CODE_PROPERTIES');
print '</div>';
print '<ul id="code_blame_mainarea_result_info_property_list">';
foreach ($file['properties'] as $pn => $pv)
{
print '<li>';
print htmlspecialchars($pn);
print ' - ';
print htmlspecialchars($pv);
print '</li>';
}
print '</ul>';
}
?>
</pre>
</div> <!-- code_blame_mainarea_result_info -->
</div> <!-- code_blame_mainarea_result --> </div> <!-- code_blame_mainarea_result -->

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

@ -64,38 +64,44 @@ $this->load->view (
<div class="mainarea" id="code_diff_mainarea"> <div class="mainarea" id="code_diff_mainarea">
<div class="title" id="code_diff_mainarea_title"> <div class="title-band" id="code_diff_mainarea_title_band">
<?php
if ($revision1 <= 0)
{
$revreq = '';
$revreqroot = '';
}
else
{
$revreq = "/{$file['created_rev']}";
$revreqroot = '/' . $this->converter->AsciiToHex ('.') . $revreq;
}
print anchor ( <div class="title" id="code_diff_mainarea_title">
"code/file/{$project->id}{$revreqroot}", <?php
htmlspecialchars($project->name)); if ($revision1 <= 0)
{
$revreq = '';
$revreqroot = '';
}
else
{
$revreq = "/{$file['created_rev']}";
$revreqroot = '/' . $this->converter->AsciiToHex ('.') . $revreq;
}
$exps = explode ('/', $headpath); print anchor (
$expsize = count($exps); "code/file/{$project->id}{$revreqroot}",
$par = ''; htmlspecialchars($project->name));
for ($i = 1; $i < $expsize; $i++)
{
$par .= "/{$exps[$i]}";
$xpar = $this->converter->AsciiToHex ($par); $exps = explode ('/', $headpath);
$xpar = "code/file/{$project->id}/{$xpar}{$revreq}"; $expsize = count($exps);
$par = '';
for ($i = 1; $i < $expsize; $i++)
{
$par .= "/{$exps[$i]}";
print '/'; $xpar = $this->converter->AsciiToHex ($par);
print anchor ($xpar, htmlspecialchars($exps[$i])); $xpar = "code/file/{$project->id}/{$xpar}{$revreq}";
}
?> print '/';
</div> <!-- code_diff_mainarea_title --> print anchor ($xpar, htmlspecialchars($exps[$i]));
}
?>
</div> <!-- code_diff_mainarea_title -->
<div class="actions"></div>
<div style="clear: both;"></div>
</div>
<div class="menu" id="code_diff_mainarea_menu"> <div class="menu" id="code_diff_mainarea_menu">
<?php <?php

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

@ -25,6 +25,24 @@
<?php <?php
$enstyle_anchor_text = '<i class="fa fa-magic"></i> ' . $this->lang->line('Enstyle'); $enstyle_anchor_text = '<i class="fa fa-magic"></i> ' . $this->lang->line('Enstyle');
$destyle_anchor_text = '<i class="fa fa-times"></i> ' . $this->lang->line('Destyle'); $destyle_anchor_text = '<i class="fa fa-times"></i> ' . $this->lang->line('Destyle');
$hex_headpath = $this->converter->AsciiToHex ($headpath);
if ($revision <= 0)
{
$revreq = '';
$revreqroot = '';
$history_path = "/code/history/{$project->id}/{$hex_headpath}";
}
else
{
$revreq = "/{$file['created_rev']}";
$revreqroot = '/' . $this->converter->AsciiToHex ('.') . $revreq;
if ($hex_headpath == '') $revtrailer = $revreqroot;
else $revtrailer = "/{$hex_headpath}{$revreq}";
$history_path = "/code/history/{$project->id}{$revtrailer}";
}
?> ?>
<script type="text/javascript"> <script type="text/javascript">
@ -48,25 +66,57 @@ function showRawCode()
} }
$(function () { $(function () {
<?php
if ($login['settings'] != NULL && $login['settings']->code_hide_metadata == 'Y')
print '$("#code_file_mainarea_result_info").hide();';
?>
btn = $("#code_file_mainarea_metadata_button").button().click (function () { $('#code_file_mainarea_metadata').accordion({
if ($("#code_file_mainarea_result_info").is(":visible")) collapsible: true
});
$("#code_file_mainarea_loc_info").hide();
btn = $("#code_file_mainarea_loc_button").button().click (function () {
if ($("#code_file_mainarea_loc_info").is(":visible"))
{ {
$("#code_file_mainarea_result_info").hide("blind",{},200); $("#code_file_mainarea_loc_info").hide("blind",{},200);
} }
else else
{ {
$("#code_file_mainarea_result_info").show("blind",{},200); $("#code_file_mainarea_loc_info").show("blind",{},200);
} }
return false; // prevent the default behavior return false; // prevent the default behavior
}); });
$("#code_file_mainarea_edit_button").button(); $("#code_file_mainarea_edit_button").button();
<?php if ($file['created_rev'] != $file['head_rev']): ?>
$("#code_file_mainarea_headrev_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/file/{$project->id}/${hex_headpath}"; ?>'));
return false;
});
<?php endif; ?>
$("#code_file_mainarea_blame_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/blame/{$project->id}/${hex_headpath}{$revreq}"; ?>'));
return false;
});
$("#code_file_mainarea_diff_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/diff/{$project->id}/${hex_headpath}{$revreq}"; ?>'));
return false;
});
$("#code_file_mainarea_fulldiff_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/fulldiff/{$project->id}/${hex_headpath}{$revreq}"; ?>'));
return false;
});
$("#code_file_mainarea_history_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print $history_path; ?>'));
return false;
});
$("#code_file_mainarea_download_button").button().click (function() {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", '<?php print "/code/fetch/{$project->id}/${hex_headpath}{$revreq}"; ?>'));
return false;
});
$("#code_file_mainarea_style_button").button({"label": '<?php print $destyle_anchor_text; ?>'}).click (function () { $("#code_file_mainarea_style_button").button({"label": '<?php print $destyle_anchor_text; ?>'}).click (function () {
showRawCode(); showRawCode();
return false; return false;
@ -121,18 +171,7 @@ $this->load->view (
<div class="title-band" id="code_file_mainarea_title_band"> <div class="title-band" id="code_file_mainarea_title_band">
<div class="title" id="code_file_mainarea_title"> <div class="title" id="code_file_mainarea_title">
<?php <?php
if ($revision <= 0)
{
$revreq = '';
$revreqroot = '';
}
else
{
$revreq = "/{$file['created_rev']}";
$revreqroot = '/' . $this->converter->AsciiToHex ('.') . $revreq;
}
print anchor ( print anchor (
"code/file/{$project->id}{$revreqroot}", "code/file/{$project->id}{$revreqroot}",
htmlspecialchars($project->name)); htmlspecialchars($project->name));
@ -156,18 +195,18 @@ $this->load->view (
print ' - '; print ' - ';
print htmlspecialchars($file['fullpath']); print htmlspecialchars($file['fullpath']);
} }
?> ?>
</div> <!-- code_file_mainarea_title --> </div> <!-- code_file_mainarea_title -->
<div class="actions"> <div class="actions">
<?php <?php
print anchor ("code/file/{$project->id}/${xpar}/{$file['prev_rev']}", '<i class="fa fa-arrow-circle-left"></i>'); print anchor ("code/file/{$project->id}/${hex_headpath}/{$file['prev_rev']}", '<i class="fa fa-arrow-circle-left"></i>');
print ' '; print ' ';
// anchor to the revision history at the root directory // anchor to the revision history at the root directory
print anchor ( print anchor (
//"code/revision/{$project->id}/!/{$file['created_rev']}", //"code/revision/{$project->id}/!/{$file['created_rev']}",
"code/revision/{$project->id}/${xpar}/{$file['created_rev']}", "code/revision/{$project->id}/${hex_headpath}/{$file['created_rev']}",
sprintf("%s %s", $this->lang->line('Revision'), $file['created_rev']) sprintf("%s %s", $this->lang->line('Revision'), $file['created_rev'])
); );
@ -180,7 +219,7 @@ $this->load->view (
} }
print ' '; print ' ';
print anchor ("code/file/{$project->id}/${xpar}/{$file['next_rev']}", '<i class="fa fa-arrow-circle-right"></i>'); print anchor ("code/file/{$project->id}/${hex_headpath}/{$file['next_rev']}", '<i class="fa fa-arrow-circle-right"></i>');
print ' | '; print ' | ';
printf ('%s: %s', $this->lang->line('Size'), $file['size']); printf ('%s: %s', $this->lang->line('Size'), $file['size']);
@ -189,60 +228,77 @@ $this->load->view (
if ((isset($login['id']) && $login['id'] != '')) if ((isset($login['id']) && $login['id'] != ''))
{ {
print ' '; print ' ';
print anchor ("code/edit/{$project->id}/{$xpar}{$revreq}", $this->lang->line('Edit'), 'id="code_file_mainarea_edit_button"'); print anchor ("code/edit/{$project->id}/{$hex_headpath}{$revreq}", $this->lang->line('Edit'), 'id="code_file_mainarea_edit_button"');
} }
print anchor ("#", "LOC", "id=code_file_mainarea_loc_button");
print anchor ("#", $this->lang->line('Enstyle'), 'id="code_file_mainarea_style_button"'); ?>
?>
<a id="code_file_mainarea_metadata_button" href='#'><?php print $this->lang->line('Metadata')?></a>
</div> </div>
<div style="clear: both;"></div> <div style="clear: both;"></div>
</div> </div>
<div class="menu" id="code_file_mainarea_menu"> <div id='code_file_mainarea_metadata' class='collapsible-box'>
<?php <div id='code_file_mainarea_metadata_header' class='collapsible-box-header'>
$xpar = $this->converter->AsciiToHex ($headpath); <?php
print '<div class="metadata-committer">';
$user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($file['last_author']));
print "<img src='{$user_icon_url}' class='metadata-committer-icon' />";
print htmlspecialchars ($file['last_author']);
print '</div>';
$blame_anchor_text = '<i class="fa fa-bomb"></i> ' . $this->lang->line('Blame'); print '<div class="metadata-menu">';
$history_anchor_text = '<i class="fa fa-history"></i> ' . $this->lang->line('History');
$download_anchor_text = '<i class="fa fa-download"></i> ' . $this->lang->line('Download');
$diff_anchor_text = '<i class="fa fa-server"></i> ' . $this->lang->line('Difference');
$fulldiff_anchor_text = '<i class="fa fa-tasks"></i> ' . $this->lang->line('Full Difference');
if ($file['created_rev'] != $file['head_rev']) $blame_anchor_text = '<i class="fa fa-bomb"></i> ' . $this->lang->line('Blame');
{ $history_anchor_text = '<i class="fa fa-history"></i> ' . $this->lang->line('History');
$head_revision_text = '<i class="fa fa-exclamation-triangle" style="color:#CC2222"></i> ' . $this->lang->line('Head revision'); $download_anchor_text = '<i class="fa fa-download"></i> ' . $this->lang->line('Download');
print anchor ( $diff_anchor_text = '<i class="fa fa-server"></i> ' . $this->lang->line('Difference');
"code/file/{$project->id}/${xpar}", $fulldiff_anchor_text = '<i class="fa fa-tasks"></i> ' . $this->lang->line('Full Difference');
$head_revision_text);
print ' | ';
}
print anchor ("code/blame/{$project->id}/${xpar}{$revreq}", $blame_anchor_text); if ($file['created_rev'] != $file['head_rev'])
print ' | '; {
print anchor ("code/diff/{$project->id}/{$xpar}{$revreq}", $diff_anchor_text); $head_revision_text = '<i class="fa fa-exclamation-triangle" style="color:#CC2222"></i> ' . $this->lang->line('Head revision');
print ' | '; print anchor ('#', $head_revision_text, 'id="code_file_mainarea_headrev_button"');
print anchor ("code/fulldiff/{$project->id}/{$xpar}{$revreq}", $fulldiff_anchor_text); }
print ' | ';
if ($revision > 0) print anchor ('#', $blame_anchor_text, 'id="code_file_mainarea_blame_button"');
{ print anchor ('#', $diff_anchor_text, 'id="code_file_mainarea_diff_button"');
if ($xpar == '') $revtrailer = $revreqroot; print anchor ('#', $fulldiff_anchor_text, 'id="code_file_mainarea_fulldiff_button"');
else $revtrailer = "/{$xpar}{$revreq}"; print anchor ('#', $history_anchor_text, 'id="code_file_mainarea_history_button"');
print anchor ("code/history/{$project->id}{$revtrailer}", $history_anchor_text); print anchor ('#', $download_anchor_text, 'id="code_file_mainarea_download_button"');
} print anchor ('#', $this->lang->line('Enstyle'), 'id="code_file_mainarea_style_button"');
else print '</div>';
{
print anchor ("code/history/{$project->id}/{$xpar}", $history_anchor_text);
}
print ' | '; print '<div class="metadata-commit-date">';
print anchor ("code/fetch/{$project->id}/${xpar}{$revreq}", $download_anchor_text); printf ('[%s] ', $file['created_rev']);
?> print strftime ('%Y-%m-%d %H:%M:%S %z', $file['time_t']);
</div> <!-- code_file_mainarea_menu --> print '</div>';
?>
<div style='clear: both'></div>
</div>
<div id='code_file_mainarea_metadata_body'>
<pre class='pre-wrapped'><?php print htmlspecialchars ($file['logmsg']); ?></pre>
<?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0)
{
print '<ul id="code_file_mainarea_loc_info_property_list">';
foreach ($file['properties'] as $pn => $pv)
{
print '<li>';
print htmlspecialchars($pn);
if ($pv != '')
{
print ' - ';
print htmlspecialchars($pv);
}
print '</li>';
}
print '</ul>';
}
?>
</div>
</div>
<div style="display:none"> <div style="display:none">
<pre id="code_file_mainarea_result_raw"> <pre id="code_file_mainarea_result_raw">
@ -326,49 +382,15 @@ if ($login['settings'] != NULL &&
?> ?>
</pre> </pre>
<div id="code_file_mainarea_result_info" class="infobox"> <div id="code_file_mainarea_loc_info" class="infobox">
<div class="title"><?php print $this->lang->line('CODE_COMMIT') ?></div>
<ul>
<li><?php printf ($this->lang->line('CODE_MSG_COMMITTED_BY_ON'), $file['last_author'], $file['time']); ?></li>
</ul>
<div class="title"><?php print $this->lang->line('Message') ?></div>
<pre id="code_file_mainarea_result_info_logmsg" class="pre-wrapped">
<?php print htmlspecialchars ($file['logmsg']) ?>
</pre>
<?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0)
{
print '<div class="title">';
print $this->lang->line('CODE_PROPERTIES');
print '</div>';
print '<ul id="code_file_mainarea_result_info_property_list">';
foreach ($file['properties'] as $pn => $pv)
{
print '<li>';
print htmlspecialchars($pn);
if ($pv != '')
{
print ' - ';
print htmlspecialchars($pv);
}
print '</li>';
}
print '</ul>';
}
?>
</pre>
<div class="title">LOC</div> <div class="title">LOC</div>
<?php <?php
/* TODO: show this if it's enabled in the user settings */ /* TODO: show this if it's enabled in the user settings */
$graph_url = codepot_merge_path (site_url(), "/code/graph/cloc-file/{$project->id}/{$xpar}{$revreq}"); $graph_url = codepot_merge_path (site_url(), "/code/graph/cloc-file/{$project->id}/{$hex_headpath}{$revreq}");
print "<img src='{$graph_url}' id='code_file_mainarea_result_info_locgraph' />"; print "<img src='{$graph_url}' id='code_file_mainarea_loc_info_locgraph' />";
?> ?>
</div> <!-- code_file_mainarea_result_info --> </div>
</div> <!-- code_file_mainarea_loc_info -->
</div> <!-- code_file_mainarea_result --> </div> <!-- code_file_mainarea_result -->

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

@ -726,34 +726,40 @@ $this->load->view (
<div class="mainarea" id="code_folder_mainarea"> <div class="mainarea" id="code_folder_mainarea">
<div class="title"> <div class="title-band" id="code_folder_mainarea_title_band">
<?php
// print the main anchor for the root folder.
// let the anchor text be the project name.
print anchor (
"code/file/{$project->id}{$revreqroot}",
htmlspecialchars($project->name));
// explode non-root folder parts to anchors <div class="title">
$exps = explode ('/', $headpath); <?php
$expsize = count($exps); // print the main anchor for the root folder.
$par = ''; // let the anchor text be the project name.
for ($i = 1; $i < $expsize; $i++)
{
print '/';
$par .= '/' . $exps[$i];
$xpar = $this->converter->AsciiToHex ($par);
print anchor ( print anchor (
"code/file/{$project->id}/{$xpar}{$revreq}", "code/file/{$project->id}{$revreqroot}",
htmlspecialchars($exps[$i])); htmlspecialchars($project->name));
}
if ($headpath != $file['fullpath']) // explode non-root folder parts to anchors
{ $exps = explode ('/', $headpath);
print ' - '; $expsize = count($exps);
print htmlspecialchars ($file['fullpath']); $par = '';
} for ($i = 1; $i < $expsize; $i++)
?> {
print '/';
$par .= '/' . $exps[$i];
$xpar = $this->converter->AsciiToHex ($par);
print anchor (
"code/file/{$project->id}/{$xpar}{$revreq}",
htmlspecialchars($exps[$i]));
}
if ($headpath != $file['fullpath'])
{
print ' - ';
print htmlspecialchars ($file['fullpath']);
}
?>
</div>
<div class="actions"></div>
<div style="clear: both;"></div>
</div> </div>
<div class="infostrip" id="code_folder_mainarea_infostrip"> <div class="infostrip" id="code_folder_mainarea_infostrip">

66
codepot/src/codepot/views/code_history.php
View File

@ -51,39 +51,45 @@ $this->load->view (
<div class="mainarea" id="code_history_mainarea"> <div class="mainarea" id="code_history_mainarea">
<div class="title" id="code_history_mainarea_title"> <div class="title-band" id="code_history_mainarea_title_band">
<?php
if ($revision <= 0)
{
$revreq = '';
$revreqroot = '';
}
else
{
$revreq = "/{$revision}";
$revreqroot = '/' . $this->converter->AsciiToHex('.') . $revreq;
}
// print the anchor for the root nolder with a project name <div class="title" id="code_history_mainarea_title">
print anchor ( <?php
"code/history/{$project->id}{$revreqroot}", if ($revision <= 0)
htmlspecialchars($project->name)); {
$revreq = '';
$revreqroot = '';
}
else
{
$revreq = "/{$revision}";
$revreqroot = '/' . $this->converter->AsciiToHex('.') . $revreq;
}
// explodes part of the full path name into an array // print the anchor for the root nolder with a project name
$exps = explode ('/', $fullpath);
$expsize = count($exps);
$par = '';
// print anchors pointing to each part
for ($i = 1; $i < $expsize; $i++)
{
print '/';
$par .= '/' . $exps[$i];
$xpar = $this->converter->AsciiToHex ($par);
print anchor ( print anchor (
"code/history/{$project->id}/{$xpar}{$revreq}", "code/history/{$project->id}{$revreqroot}",
htmlspecialchars($exps[$i])); htmlspecialchars($project->name));
}
?> // explodes part of the full path name into an array
$exps = explode ('/', $fullpath);
$expsize = count($exps);
$par = '';
// print anchors pointing to each part
for ($i = 1; $i < $expsize; $i++)
{
print '/';
$par .= '/' . $exps[$i];
$xpar = $this->converter->AsciiToHex ($par);
print anchor (
"code/history/{$project->id}/{$xpar}{$revreq}",
htmlspecialchars($exps[$i]));
}
?>
</div>
<div class="actions"></div>
<div style="clear: both;"></div>
</div> </div>
<div class="menu" id="code_history_mainarea_menu"> <div class="menu" id="code_history_mainarea_menu">

57
codepot/src/css/code.css
View File

@ -77,6 +77,63 @@
height: auto; height: auto;
} }
#code_file_mainarea_metadata_header,
#code_blame_mainarea_metadata_header {
line-height: 2em;
}
#code_file_mainarea_metadata_header .metadata-committer-icon,
#code_blame_mainarea_metadata_header .metadata-committer-icon {
height: 2em;
width: auto;
vertical-align: middle;
margin-right: 2px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
#code_file_mainarea_metadata_header .metadata-committer,
#code_blame_mainarea_metadata_header .metadata-committer {
float: left;
color: #111111;
}
#code_file_mainarea_metadata_header .metadata-menu,
#code_blame_mainarea_metadata_header .metadata-menu {
float: left;
margin-left: 1em;
}
#code_file_mainarea_metadata_header .metadata-commit-date,
#code_blame_mainarea_metadata_header .metadata-commit-date {
float: right;
}
#code_file_mainarea_metadata_body,
#code_blame_mainarea_metadata_body {
background-color: #FCFCFC;
padding: 0 0.5em 0 0.5em;
margin: 0;
}
#code_file_mainarea_metadata_body ul,
#code_blame_mainarea_metadata_body ul {
padding: 0;
margin: 0 0 0.5em 0;
list-style: outside none none;
}
#code_file_mainarea_metadata_body ul li,
#code_blame_mainarea_metadata_body ul li {
padding: 0.2em 0.2em 0.2em 0.2em;
margin: 0em 0.2em 0.4em 0.2em;
float: left;
background-color: #44AD8E;
color: #FFFFFF;
}
/*----------------------------------------------- /*-----------------------------------------------
* project source blame view * project source blame view
*-----------------------------------------------*/ *-----------------------------------------------*/