From 5cc9a3709882aa1595f7cd5a5c15ef28b9440574 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Sat, 9 Jan 2016 04:35:03 +0000 Subject: [PATCH] renewed the code revision view --- codepot/src/codepot/views/code_file.php | 8 +- codepot/src/codepot/views/code_folder.php | 8 +- codepot/src/codepot/views/code_revision.php | 97 +++++++++++---------- codepot/src/css/code.css | 25 +++--- 4 files changed, 74 insertions(+), 64 deletions(-) diff --git a/codepot/src/codepot/views/code_file.php b/codepot/src/codepot/views/code_file.php index 21c8cd3a..93a841d6 100644 --- a/codepot/src/codepot/views/code_file.php +++ b/codepot/src/codepot/views/code_file.php @@ -239,7 +239,7 @@ $this->load->view (
- '; $user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($file['last_author'])); print ""; @@ -272,7 +272,7 @@ $this->load->view ( printf ('[%s] ', $file['created_rev']); print strftime ('%Y-%m-%d %H:%M:%S %z', $file['time_t']); print '
'; - ?> + ?>
@@ -383,8 +383,6 @@ if ($login['settings'] != NULL && - -
LOC
+ +
diff --git a/codepot/src/codepot/views/code_folder.php b/codepot/src/codepot/views/code_folder.php index a20f8e0a..99c138e2 100644 --- a/codepot/src/codepot/views/code_folder.php +++ b/codepot/src/codepot/views/code_folder.php @@ -892,10 +892,10 @@ $this->load->view (
-
-
+
+
-load->view ( print '
'; } -?> + ?> diff --git a/codepot/src/codepot/views/code_revision.php b/codepot/src/codepot/views/code_revision.php index c0bc1658..4e3f0b60 100644 --- a/codepot/src/codepot/views/code_revision.php +++ b/codepot/src/codepot/views/code_revision.php @@ -22,18 +22,25 @@ converter->AsciiToHex(($headpath == '')? '.': $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}"; } - $hex_headpath = $this->converter->AsciiToHex(($headpath == '')? '.': $headpath); $creole_base = site_url() . "/wiki/show/{$project->id}/"; $creole_file_base = site_url() . "/wiki/attachment0/{$project->id}/"; ?> @@ -86,8 +93,15 @@ var work_in_progress = false; - + $(function() { + + $("#code_revision_history_button").button().click (function() { + $(location).attr ('href', codepot_merge_path("", '')); + return false; + }); + + $('#code_revision_edit_revision_tag_form').dialog ( { title: 'lang->line('Tag');?>', @@ -255,12 +269,9 @@ $(function() { return false; } ); -}); -$(function() { - $('#code_revision_new_review_comment_tabs').tabs (); $('#code_revision_new_review_comment_tabs').bind ('tabsshow', function (event, ui) { if (ui.index == 1) preview_new_review_comment ($('#code_revision_new_review_comment').val()); @@ -459,8 +470,9 @@ $(function() { } } ?> -}); +}); + function render_wiki() { @@ -490,7 +502,7 @@ function hide_unneeded_divs() } $(function() { - $("#code_revision_mainarea_result_msg_container").accordion ({ + $("#code_revision_mainarea_result_message").accordion ({ collapsible: true }); @@ -617,12 +629,6 @@ $history = $file['history']; print anchor ("#", $this->lang->line('Tag'), array ('id' => 'code_revision_edit_revision_tag_button')); print ''; } - - print ' | '; - printf ('%s: %s', $this->lang->line('Committer'), htmlspecialchars($history['author'])); - print ' | '; - - printf ('%s: %s', $this->lang->line('Last updated on'), date('r', strtotime($history['date']))); ?> @@ -631,45 +637,46 @@ $history = $file['history'];
-
-
lang->line('Message')?>  - - - lang->line('Edit'), - array ('id' => 'code_revision_edit_revision_message_button')); - ?> - - -
+
+
+ '; + $user_icon_url = codepot_merge_path (site_url(), '/user/icon/' . $this->converter->AsciiToHex($history['author'])); + print ""; + print htmlspecialchars ($history['author']); + print '
'; -
-
-
-
-
+ print '
'; + if ($can_edit) + { + print ''; + print anchor ("#", $this->lang->line('Edit'), + array ('id' => 'code_revision_edit_revision_message_button')); + print ''; + } + + $history_anchor_text = ' ' . $this->lang->line('History'); + print anchor ("#", $history_anchor_text, 'id="code_revision_history_button"'); + print '
'; + + print '
'; + printf ('[%s] ', $history['rev']); + print strftime ('%Y-%m-%d %H:%M:%S %z', strtotime($history['date'])); + print '
'; + ?> + +
+
+ +
+
+
diff --git a/codepot/src/css/code.css b/codepot/src/css/code.css index 6e82daed..8ac22290 100644 --- a/codepot/src/css/code.css +++ b/codepot/src/css/code.css @@ -78,12 +78,14 @@ } #code_file_mainarea_metadata_header, -#code_blame_mainarea_metadata_header { +#code_blame_mainarea_metadata_header, +#code_revision_mainarea_result_message_header { line-height: 2em; } #code_file_mainarea_metadata_header .metadata-committer-icon, -#code_blame_mainarea_metadata_header .metadata-committer-icon { +#code_blame_mainarea_metadata_header .metadata-committer-icon, +#code_revision_mainarea_result_message_header .metadata-committer-icon { height: 2em; width: auto; vertical-align: middle; @@ -95,24 +97,28 @@ } #code_file_mainarea_metadata_header .metadata-committer, -#code_blame_mainarea_metadata_header .metadata-committer { +#code_blame_mainarea_metadata_header .metadata-committer, +#code_revision_mainarea_result_message_header .metadata-committer { float: left; color: #111111; } #code_file_mainarea_metadata_header .metadata-menu, -#code_blame_mainarea_metadata_header .metadata-menu { +#code_blame_mainarea_metadata_header .metadata-menu, +#code_revision_mainarea_result_message_header .metadata-menu { float: left; margin-left: 1em; } #code_file_mainarea_metadata_header .metadata-commit-date, -#code_blame_mainarea_metadata_header .metadata-commit-date { +#code_blame_mainarea_metadata_header .metadata-commit-date, +#code_revision_mainarea_result_message_header .metadata-commit-date { float: right; } #code_file_mainarea_metadata_body, -#code_blame_mainarea_metadata_body { +#code_blame_mainarea_metadata_body, +#code_revision_mainarea_result_message_body { background-color: #FCFCFC; padding: 0 0.5em 0 0.5em; margin: 0; @@ -240,13 +246,10 @@ } #code_revision_mainarea_result .collapsible-box{ - margin-top: 0.5em; + margin-bottom: 0.5em; } -#code_revision_mainarea_result_msg { -} - -#code_revision_mainarea_result_msg_text { +#code_revision_mainarea_result_message_text { line-height: 1.3em; padding: 0 0.2em 0 0.2em; }