diff --git a/codepot/src/codepot/views/code_history.php b/codepot/src/codepot/views/code_history.php index 2db8156c..a532b9c8 100644 --- a/codepot/src/codepot/views/code_history.php +++ b/codepot/src/codepot/views/code_history.php @@ -156,7 +156,7 @@ $this->load->view ( print ''; print '
'; - print '
'; + print '
'; print ''; print anchor ("code/file/{$project->id}/{$xfullpath}/{$h['rev']}", $h['rev']); if (!empty($h['tag'])) @@ -175,7 +175,7 @@ $this->load->view ( print ''; print '
'; - print '
'; + print '
'; print ""; print htmlspecialchars($h['author']); print ''; @@ -188,10 +188,10 @@ $this->load->view ( if ($file['type'] == 'file') { print anchor ("code/blame/{$project->id}/{$xfullpath}/{$h['rev']}", - '
' . $this->lang->line('Blame') . '
'); + '
' . $this->lang->line('Blame') . '
'); print anchor ("code/diff/{$project->id}/{$xfullpath}/{$h['rev']}", - '
' . $this->lang->line('Difference') . '
'); + '
' . $this->lang->line('Difference') . '
'); } print '
'; print ''; diff --git a/codepot/src/codepot/views/code_revision.php b/codepot/src/codepot/views/code_revision.php index 1e9d3d98..b6686983 100644 --- a/codepot/src/codepot/views/code_revision.php +++ b/codepot/src/codepot/views/code_revision.php @@ -739,6 +739,7 @@ $history = $file['history']; */ $diff_anchor_text = ' ' . $this->lang->line('Difference'); $fulldiff_anchor_text = ' ' . $this->lang->line('Full Difference'); + $blame_anchor_text = ' ' . $this->lang->line('Blame'); $rowclasses = array ('odd', 'even'); $rowcount = 0; @@ -749,18 +750,22 @@ $history = $file['history']; $xpar = $this->converter->AsciiToHex ($p['path']); - print ""; + print ""; print anchor ("code/file/{$project->id}/{$xpar}/{$history['rev']}", htmlspecialchars($p['path'])); print ''; print ''; - //print anchor ("code/blame/{$project->id}/{$xpar}/{$history['rev']}", $this->lang->line('Blame')); - //print ' '; + print '
    '; + print '
  • '; print anchor ("code/diff/{$project->id}/{$xpar}/{$history['rev']}", $diff_anchor_text); - print ''; - - print ''; + print '
  • '; + print '
  • '; print anchor ("code/fulldiff/{$project->id}/{$xpar}/{$history['rev']}", $fulldiff_anchor_text); + print '
  • '; + print '
  • '; + print anchor ("code/blame/{$project->id}/{$xpar}/{$history['rev']}", $blame_anchor_text); + print '
  • '; + print '
'; print ''; print ''; diff --git a/codepot/src/css/code.css b/codepot/src/css/code.css index ff22305e..36a123e3 100644 --- a/codepot/src/css/code.css +++ b/codepot/src/css/code.css @@ -276,27 +276,6 @@ vertical-align: middle; } - -#code_history_result_table .commit-revision, -#code_history_result_table .commit-author-id { - 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, -#code_history_result_table .commit-author-id:hover { - background-color: #00BCFA; -} - #code_history_result_table .commit-actions { display: flex; flex-wrap: nowrap; @@ -304,33 +283,6 @@ vertical-align: middle; } -#code_history_result_table .commit-revision a, -#code_history_result_table .commit-revision a:hover, -#code_history_result_table .commit-revision a:visited, -#code_history_result_table .commit-author-id a, -#code_history_result_table .commit-author-id a:hover, -#code_history_result_table .commit-author-id 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 *-----------------------------------------------*/ @@ -372,6 +324,7 @@ #code_revision_result_properties_table td { white-space: pre-wrap; padding-left: 22px; + vertical-align: middle; } #code_revision_result_files_table td.M, diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css index b67c9376..6c20d7ff 100644 --- a/codepot/src/css/common.css +++ b/codepot/src/css/common.css @@ -1072,6 +1072,32 @@ pre.codepot-line-numbered span.codepot-line-number-clear { border-radius: 3px; } +.codepot-buttoned-anchor { + 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; +} + +.codepot-buttoned-anchor:hover { + background-color: #00BCFA; +} + +.codepot-buttoned-anchor a, +.codepot-buttoned-anchor a:hover, +.codepot-buttoned-anchor a:visited, +a.codepot-buttoned-anchor, +a.codepot-buttoned-anchor:hover , +a.codepot-buttoned-anchor:visited { + color: white !important; +} /* === list === */ ul.codepot-horizontal-list { @@ -1087,7 +1113,6 @@ ul.codepot-horizontal-list li { float: left; } - .codepot-hashed-revision-number { /* #RXXXX */ background-color: #CACACA;