diff --git a/codepot/src/codepot/views/code_revision.php b/codepot/src/codepot/views/code_revision.php index 79db7d4d..0a754841 100644 --- a/codepot/src/codepot/views/code_revision.php +++ b/codepot/src/codepot/views/code_revision.php @@ -208,8 +208,27 @@ function hide_unneeded_divs() } $(function() { + $("#code_revision_mainarea_result_msg_container").accordion ({ + collapsible: true + }); + + $("#code_revision_mainarea_result_files").accordion ({ + collapsible: true + }); + + $("#code_revision_mainarea_result_properties").accordion ({ + collapsible: true + }); + + $("#code_revision_mainarea_result_comments").accordion ({ + collapsible: true + }); + hide_unneeded_divs (); render_wiki (); + + + }); @@ -355,7 +374,8 @@ $history = $file['history'];
-
lang->line('Message')?>  +
+
lang->line('Message')?>  lang->line('Edit'), @@ -365,14 +385,16 @@ $history = $file['history'];
-
+
 
 
+
-
-
lang->line('Files')?>
+
+
lang->line('Files')?>
+
+
-
-
lang->line('CODE_PROPERTIES');?>
+
+
lang->line('CODE_PROPERTIES');?>
+
0 || count($deleted_props) > 0) { @@ -474,9 +498,10 @@ $history = $file['history']; ?>
+
-
-
lang->line('Comment')?>  +
+
lang->line('Comment')?>  lang->line('New'), @@ -486,7 +511,7 @@ $history = $file['history'];
-
+
0; $i--) { @@ -520,7 +545,6 @@ $history = $file['history'];
-
diff --git a/codepot/src/codepot/views/project_home.php b/codepot/src/codepot/views/project_home.php index 354ee5bf..97d09f49 100644 --- a/codepot/src/codepot/views/project_home.php +++ b/codepot/src/codepot/views/project_home.php @@ -54,6 +54,7 @@ function render_wiki() $("#project_home_sidebar_log_all_button").button ().click (function () { $(location).attr ('href', codepot_merge_path("", "/project/log/" + "id; ?>")); + return false; }); } diff --git a/codepot/src/codepot/views/site_home.php b/codepot/src/codepot/views/site_home.php index 96a27604..c625c198 100644 --- a/codepot/src/codepot/views/site_home.php +++ b/codepot/src/codepot/views/site_home.php @@ -60,6 +60,7 @@ $(function () { $("#site_home_sidebar_log_all_button").button ().click (function () { $(location).attr ('href', codepot_merge_path("", "/site/log")); + return false; }); }); diff --git a/codepot/src/css/code.css b/codepot/src/css/code.css index 83e5f85a..4b23005b 100644 --- a/codepot/src/css/code.css +++ b/codepot/src/css/code.css @@ -110,65 +110,31 @@ overflow: auto; } -#code_revision_mainarea_result .title .anchor { - font-size: 70%; +#code_revision_mainarea_result .collapsible-box{ + margin-top: 0.5em; } #code_revision_mainarea_result_msg { } #code_revision_mainarea_result_msg_text { - padding: 0.5em 0.5em 0.5em 0.5em; - - line-height: 1.2em; - background-color: #F8F8FA; - - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; -} - -#code_revision_mainarea_result_files_table td { - white-space: nowrap; -} - -#code_revision_mainarea_result_files_table td.M { - white-space: nowrap; - background-image:url(images/page_white_edit.png); - background-position:2px 50%; - background-repeat:no-repeat; - padding-left: 22px; -} - -#code_revision_mainarea_result_files_table td.D { - white-space: nowrap; - background-image:url(images/page_white_delete.png); - background-position:2px 50%; - background-repeat:no-repeat; - padding-left: 22px; -} - -#code_revision_mainarea_result_files_table td.A { - white-space: nowrap; - background-image:url(images/page_white_add.png); - background-position:2px 50%; - background-repeat:no-repeat; - padding-left: 22px; -} - -#code_revision_mainarea_result_files_table td.R { - white-space: nowrap; - background-image:url(images/page_white_add.png); - background-position:2px 50%; - background-repeat:no-repeat; - padding-left: 22px; + line-height: 1.3em; + padding: 0 0.2em 0 0.2em; } +#code_revision_mainarea_result_files_table, #code_revision_mainarea_result_properties_table { - border-spacing: 0; - border-collapse: collapse; + padding: 0.5em 0 0.5em 0; + background: inherit; + line-height: 1.5em; } +#code_revision_mainarea_result_files_table td, +#code_revision_mainarea_result_properties_table td { + white-space: nowrap; +} + +#code_revision_mainarea_result_files_table td.M, #code_revision_mainarea_result_properties_table td.M { white-space: nowrap; background-image:url(images/page_white_edit.png); @@ -177,6 +143,7 @@ padding-left: 22px; } +#code_revision_mainarea_result_files_table td.D, #code_revision_mainarea_result_properties_table td.D { white-space: nowrap; background-image:url(images/page_white_delete.png); @@ -185,6 +152,7 @@ padding-left: 22px; } +#code_revision_mainarea_result_files_table td.A, #code_revision_mainarea_result_properties_table td.A { white-space: nowrap; background-image:url(images/page_white_add.png); @@ -193,6 +161,15 @@ padding-left: 22px; } +#code_revision_mainarea_result_files_table td.R, +#code_revision_mainarea_result_properties_table td.R { + white-space: nowrap; + background-image:url(images/page_white_add.png); + background-position:2px 50%; + background-repeat:no-repeat; + padding-left: 22px; +} + .review_comment_title { padding: 3px 3px 3px 3px; margin-top: 5px; diff --git a/codepot/src/css/common.css b/codepot/src/css/common.css index 9f412bd5..3551c990 100644 --- a/codepot/src/css/common.css +++ b/codepot/src/css/common.css @@ -107,6 +107,12 @@ body { margin: 1px 0 0 0; } +.content .collapsible-box-panel { + line-height: 2em; + margin: 1px 0 0 0; + padding: 0.2em 0.2em 0.2em 0.2em !important; /* !important so that jquery-ui.css doesn't override this */ +} + .content .taskbar { font-size: 1em; /*font-weight: bold;*/