diff --git a/codepot/src/codepot/views/code_history.php b/codepot/src/codepot/views/code_history.php index 290241d3..c75530f6 100644 --- a/codepot/src/codepot/views/code_history.php +++ b/codepot/src/codepot/views/code_history.php @@ -92,8 +92,10 @@ $this->load->view (
-
+ + +
-->
- - - - '; ?> + load->view ( for ($i = $history_count; $i > 0; ) { $h = $history[--$i]; + $xfullpath = $this->converter->AsciiToHex (($fullpath == '')? '.': $fullpath); $rowclass = $rowclasses[($history_count - $i) % 2]; - print ""; + //print ""; + print ""; - print ''; - - print ''; - print ''; - print ''; + print ''; - print ''; + print ''; - print ''; // diff --git a/codepot/src/css/code.css b/codepot/src/css/code.css index a12f5b8a..87a88c46 100644 --- a/codepot/src/css/code.css +++ b/codepot/src/css/code.css @@ -222,6 +222,24 @@ background-color: #AABBFF; } +#code_history_result_table td.commit-author-td { + width: 1%; +} + +#code_history_result_table img.commit-author-icon { + width: 3em; + height: 3em; +} + +#code_history_result_table .commit-author-id { + font-weight: bold; + font-size: 0.9em; +} + +#code_history_result_table td.commit-message-td { + vertical-align: middle; +} + #code_history_result_table td.commit-message-td:hover { background-color: #F0F0F0; } @@ -237,6 +255,78 @@ font-family: "DejaVu Sans Mono", consolas, monaco, "Andale Mono", monospace; } +#code_history_result_table td.commit-revision-td { + display: flex; + flex-wrap: wrap; + justify-content: space-between; + vertical-align: middle; + line-height: 1.2em; +} + +#code_history_result_table td.commit-revision-td:hover { + background-color: #F0F0F0; +} + +#code_history_result_table td.commit-revision-td div { + margin-right: 1em; +} + +#code_history_result_table .commit-revision-and-datetime { + display: flex; + flex-wrap: wrap; + justify-content: flex-start; + vertical-align: middle; +} + +#code_history_result_table .commit-actions { + display: flex; + flex-wrap: wrap; + justify-content: flex-end; + vertical-align: middle; +} + +#code_history_result_table .commit-revision { + background-color: #008CBA; + border: 1px solid #008CBA; + color: white; + padding: 0px 5px 0px 5px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 0.9em; + font-weight: bold; + border-radius: 2px; + transition-duration: 0.4s; +} + +#code_history_result_table .commit-revision:hover { + background-color: #00BCFA; +} + +#code_history_result_table .commit-revision a, +#code_history_result_table .commit-revision a:hover, +#code_history_result_table .commit-revision a:visited { + color: white +} + +#code_history_result_table .commit-action-item { + background-color: #008CBA; + border: 1px solid #008CBA; + color: white; + padding: 0px 5px 0px 5px; + text-align: center; + text-decoration: none; + display: inline-block; + font-size: 0.9em; + font-weight: bold; + border-radius: 2px; + transition-duration: 0.4s; +} + +#code_history_result_table .commit-action-item:hover { + background-color: #00BCFA; +} + /*----------------------------------------------- * project source revision view *-----------------------------------------------*/
lang->line('Revision')*/ ?> lang->line('Committer')?>lang->line('Date')?>lang->line('Message')?>lang->line('Details') ?>
'; - $xfullpath = $this->converter->AsciiToHex ( - ($fullpath == '')? '.': $fullpath); - - print anchor ("code/file/{$project->id}/{$xfullpath}/{$h['rev']}", $h['rev']); - - if (!empty($h['tag'])) - { - print ' '; - print ''; - print htmlspecialchars($h['tag']); - print ''; - } - print ''; + print ''; // Repository migration from googlecode revealed that it did not put // 'author' for initial project creation. So I've added the following check. if (array_key_exists('author', $h)) { $user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($h['author'])); - print " "; + $user_home_url = codepot_merge_path (site_url(), '/user/home/' . $this->converter->AsciiToHex($h['author'])); + //print " "; + print "
"; + print ""; + print "
"; + print ''; } print '
'; - print codepot_unixtimetodispdate(strtotime($h['date']), 'Y-m-d'); - print ''; if ($h['review_count'] > 0) { @@ -169,18 +160,43 @@ $this->load->view ( //print htmlspecialchars($h['msg']); //print ''; print '
'; + print '
'; + + print '
'; + print '
'; + print ''; + print anchor ("code/file/{$project->id}/{$xfullpath}/{$h['rev']}", $h['rev']); + if (!empty($h['tag'])) + { + print ' '; + print ''; + print htmlspecialchars($h['tag']); + print ''; + } + print ''; + print '
'; + + print '
'; + print ''; + print codepot_unixtimetodispdate(strtotime($h['date'])); + print ''; + print '
'; + print '
'; + + print '
'; if ($file['type'] == 'file') { print anchor ("code/blame/{$project->id}/{$xfullpath}/{$h['rev']}", - ' ' . $this->lang->line('Blame')); - print ' | '; + '
' . $this->lang->line('Blame') . '
'); + print anchor ("code/diff/{$project->id}/{$xfullpath}/{$h['rev']}", - ' ' . $this->lang->line('Difference')); + '
' . $this->lang->line('Difference') . '
'); } + print '
'; print '