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

styled the code history view slightly more

Browse Source
This commit is contained in:
hyung-hwan 2017-09-01 06:56:44 +00:00
parent 3528a4a684
commit a5d2e8c9c5
2 changed files with 87 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ $this->load->view (
$h = $history[--$i]; $h = $history[--$i];
$xfullpath = $this->converter->AsciiToHex (($fullpath == '')? '.': $fullpath); $xfullpath = $this->converter->AsciiToHex (($fullpath == '')? '.': $fullpath);
print "<tr>"; print '<tr class="commit-info-top">';
print '<td class="commit-author-td" rowspan=2>'; print '<td class="commit-author-td" rowspan=2>';
// Repository migration from googlecode revealed that it did not put // Repository migration from googlecode revealed that it did not put
// 'author' for initial project creation. So I've added the following check. // 'author' for initial project creation. So I've added the following check.
@ -119,38 +119,43 @@ $this->load->view (
} }
print '</td>'; print '</td>';
print '<td class="commit-basic-info-td">';
print '<table class="commit-basic-info-subtable"><tr>';
print '<td class="commit-revision-td">'; print '<td class="commit-revision-td">';
print '<div class="commit-revision">';
print '<div class="commit-revision-and-datetime">';
print '<div class="codepot-buttoned-anchor">';
print '<tt>';
print anchor ("code/file/{$project->id}/{$xfullpath}/{$h['rev']}", $h['rev']); print anchor ("code/file/{$project->id}/{$xfullpath}/{$h['rev']}", $h['rev']);
if (!empty($h['tag']))
{
print ' ';
print '<span class="left_arrow_indicator">';
print htmlspecialchars($h['tag']);
print '</span>';
}
print '</tt>';
print '</div>'; print '</div>';
print '</td>';
print '<td class="commit-datetime-td">';
print '<div class="commit-datetime">'; print '<div class="commit-datetime">';
print '<tt>';
print codepot_unixtimetodispdate(strtotime($h['date'])); print codepot_unixtimetodispdate(strtotime($h['date']));
print '</tt>';
print '</div>'; print '</div>';
print '</td>';
//print '<div class="codepot-buttoned-anchor">'; print '<td class="commit-author-text-td">';
print '<div style="font-weight: bold;">'; print '<div class="commit-author-text">';
print "<a href='{$user_home_url}'>"; print "<a href='{$user_home_url}'>";
print htmlspecialchars($h['author']); print htmlspecialchars($h['author']);
print '</a>'; print '</a>';
print '</div>'; print '</div>';
print '</div>';
print '</td>'; print '</td>';
print '<td rowspan="2" style="vertical-align:middle; width: 1%">'; print '<td class="commit-tag-td">';
if (!empty($h['tag']))
{
print '<span class="left_arrow_indicator">';
print htmlspecialchars($h['tag']);
print '</span>';
}
print '</td>';
print '</tr></table>';
print '</td>';
print '<td rowspan="2" class="commit-actions-td">';
print '<div class="commit-actions">'; print '<div class="commit-actions">';
if ($file['type'] == 'file') if ($file['type'] == 'file')
{ {
@ -161,18 +166,16 @@ $this->load->view (
'<div class="codepot-buttoned-anchor"><i class="fa fa-server"></i> ' . $this->lang->line('Difference') . '</div>'); '<div class="codepot-buttoned-anchor"><i class="fa fa-server"></i> ' . $this->lang->line('Difference') . '</div>');
} }
//print anchor ("code/revision/{$project->id}/{$xfullpath}/{$h['rev']}",
// '<div class="codepot-buttoned-anchor">' . $this->lang->line('Changes') . '</div>');
print anchor ("code/revision/{$project->id}/{$xfullpath}/{$h['rev']}", print anchor ("code/revision/{$project->id}/{$xfullpath}/{$h['rev']}",
sprintf('<img src="%s" class="codepot-buttoned-img-30" alt="%s"/>', base_url_make('/css/images/iconmonstr-script-4-240.png'), $this->lang->line('Changes'))); sprintf('<img src="%s" class="codepot-buttoned-img-30" alt="%s" title="%s"/>', base_url_make('/css/images/iconmonstr-script-4-240.png'), $this->lang->line('Changes'), 'Show revision changes'));
print '&nbsp;'; print '&nbsp;';
print anchor ("code/file/{$project->id}/{$xfullpath}/{$h['rev']}", print anchor ("code/file/{$project->id}/{$xfullpath}/{$h['rev']}",
sprintf('<img src="%s" class="codepot-buttoned-img-30" alt="%s"/>', base_url_make('/css/images/iconmonstr-sitemap-7-240.png'), $this->lang->line('Changes'))); sprintf('<img src="%s" class="codepot-buttoned-img-30" alt="%s" title="%s"/>', base_url_make('/css/images/iconmonstr-sitemap-7-240.png'), $this->lang->line('Changes'), 'Show the repository'));
print '</div>'; print '</div>';
print '</td>'; print '</td>';
print '</tr>'; print '</tr>';
print '<tr>'; print '<tr class="commit-info-bottom">';
print '<td class="commit-message-td">'; print '<td class="commit-message-td">';
if ($h['review_count'] > 0) if ($h['review_count'] > 0)

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

@ -222,25 +222,22 @@
background-color: #AABBFF; background-color: #AABBFF;
} }
#code_history_result_table td.commit-author-td { #code_history_result_table tr {
width: 1%; border: none;
vertical-align: top;
text-align: center;
padding-right: 1em;
} }
#code_history_result_table img.commit-author-icon { #code_history_result_table tr.commit-info-bottom {
width: 3em; border-bottom: 1px solid #F0F0F0;
height: 3em;
} }
#code_history_result_table td.commit-message-td { #code_history_result_table td.commit-message-td {
vertical-align: middle; vertical-align: middle;
line-height: 1.2em; line-height: 1.2em;
background-color: #F0F0F0;
} }
#code_history_result_table td.commit-message-td:hover { #code_history_result_table td.commit-message-td:hover {
background-color: #F0F0F0; background-color: #EAEAEA;
} }
#code_history_result_table a.commit-message, #code_history_result_table a.commit-message,
@ -251,37 +248,72 @@
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
white-space: -pre-wrap; /* Opera 4-6 */ white-space: -pre-wrap; /* Opera 4-6 */
white-space: -o-pre-wrap; /* Opera 7 */ white-space: -o-pre-wrap; /* Opera 7 */
font-family: "DejaVu Sans Mono", consolas, monaco, "Andale Mono", monospace; /*font-family: "DejaVu Sans Mono", consolas, monaco, "Andale Mono", monospace;*/
} }
#code_history_result_table td.commit-revision-td { #code_history_result_table td.commit-author-td {
display: flex; width: 0.1%;
flex-wrap: nowrap; vertical-align: top;
justify-content: space-between; text-align: center;
padding-right: 1em;
}
#code_history_result_table img.commit-author-icon {
width: 40px;
height: 40px;
-moz-border-radius: 3px;
-webkit-border-radius: 3px;
border-radius: 3px;
}
#code_history_result_table .commit-basic-info-subtable {
margin: 0;
padding: 0;
border: collapse;
}
#code_history_result_table td.commit-revision-td,
#code_history_result_table td.commit-datetime-td,
#code_history_result_table td.commit-author-text-td {
width: 0.1%;
white-space: nowrap;
padding: 0 1em 0 0;
vertical-align: middle; vertical-align: middle;
line-height: 1.2em; font-size: 0.9em;
} }
#code_history_result_table td.commit-revision-td:hover { #code_history_result_table td.commit-tag-td {
background-color: #F0F0F0; width: 99%;
} white-space: nowrap;
padding: 0 0 0 0;
#code_history_result_table td.commit-revision-td div {
margin-right: 1em;
}
#code_history_result_table .commit-revision-and-datetime {
display: flex;
flex-wrap: nowrap;
justify-content: flex-start;
vertical-align: middle; vertical-align: middle;
font-size: 0.9em;
}
#code_history_result_table .commit-revision,
#code_history_result_table .commit-datetime,
#code_history_result_table .commit-author-text,
#code_history_result_table .commit-tag {
border: 1px solid #FFFFFF;
}
#code_history_result_table .commit-revision:hover,
#code_history_result_table .commit-author-text:hover {
border: 1px solid #CACACA;
/*background: #CACACA;*/
}
#code_history_result_table td.commit-actions-td {
vertical-align: middle;
text-align: center;
width: 1%;
vertical-align: top;
} }
#code_history_result_table .commit-actions { #code_history_result_table .commit-actions {
display: flex; display: flex;
flex-wrap: nowrap; flex-wrap: nowrap;
justify-content: flex-end; justify-content: flex-end;
vertical-align: middle;
} }
/*----------------------------------------------- /*-----------------------------------------------