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

changed the code revision view to show information in collasible boxes

Browse Source
This commit is contained in:
hyung-hwan
2015-04-19 16:18:29 +00:00
parent be199e68ee
commit 60de017146
5 changed files with 69 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
codepot/src/codepot/views/code_revision.php
View File

@ -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 ();
});
</script>
@ -355,7 +374,8 @@ $history = $file['history'];
<div class="result" id="code_revision_mainarea_result">
<div class="title"><?php print $this->lang->line('Message')?>&nbsp;
<div id="code_revision_mainarea_result_msg_container" class="collapsible-box">
<div class="collapsible-box-header" ><?php print $this->lang->line('Message')?>&nbsp;
<?php if ($can_edit): ?>
<span class='anchor'>
<?php print anchor ("#", $this->lang->line('Edit'),
@ -365,14 +385,16 @@ $history = $file['history'];
<?php endif; ?>
</div>
<div id="code_revision_mainarea_result_msg">
<div id="code_revision_mainarea_result_msg" class="collapsible-box-panel">
<pre id="code_revision_mainarea_result_msg_text" class="pre-wrapped">
<?php print htmlspecialchars($history['msg']); ?>
</pre>
</div>
</div>
<div id="code_revision_mainarea_result_files">
<div class="title"><?php print $this->lang->line('Files')?></div>
<div id="code_revision_mainarea_result_files" class="collapsible-box">
<div class="collapsible-box-header"><?php print $this->lang->line('Files')?></div>
<div id="code_revision_mainarea_result_files_table_container" class="collapsible-box-panel">
<table id="code_revision_mainarea_result_files_table">
<?php
/*
@ -410,9 +432,11 @@ $history = $file['history'];
?>
</table>
</div>
</div>
<div id="code_revision_mainarea_result_properties">
<div class="title"><?php print $this->lang->line('CODE_PROPERTIES');?></div>
<div id="code_revision_mainarea_result_properties" class="collapsible-box">
<div class="collapsible-box-header"><?php print $this->lang->line('CODE_PROPERTIES');?></div>
<div id="code_revision_mainarea_result_properties_table_container" class="collapsible-box-panel">
<table id="code_revision_mainarea_result_properties_table">
<?php
$rowclasses = array ('odd', 'even');
@ -422,8 +446,8 @@ $history = $file['history'];
if (array_key_exists('props', $p) && array_key_exists('prev_props', $p))
{
$common_props = array_intersect_assoc ($p['props'], $p['prev_props']);
$added_props = array_diff_assoc ($p['props'], $common_props);
$deleted_props = array_diff_assoc ($p['prev_props'], $common_props);
$added_props = array_diff_assoc ($p['props'], $common_props);
$deleted_props = array_diff_assoc ($p['prev_props'], $common_props);
if (count($added_props) > 0 || count($deleted_props) > 0)
{
@ -474,9 +498,10 @@ $history = $file['history'];
?>
</table>
</div>
</div>
<div id="code_revision_mainarea_result_comments">
<div class="title"><?php print $this->lang->line('Comment')?>&nbsp;
<div id="code_revision_mainarea_result_comments" class="collapsible-box">
<div class="collapsible-box-header"><?php print $this->lang->line('Comment')?>&nbsp;
<?php if ($is_loggedin): ?>
<span class='anchor'>
<?php print anchor ("#", $this->lang->line('New'),
@ -486,7 +511,7 @@ $history = $file['history'];
<?php endif; ?>
</div>
<div id="code_revision_mainarea_review_comment">
<div id="code_revision_mainarea_review_comment" class="collapsible-box-panel">
<?php
for ($i = $review_count; $i > 0; $i--)
{
@ -520,7 +545,6 @@ $history = $file['history'];
</div> <!-- code_revision_mainarea_review_comment -->
</div> <!-- code_revision_mainarea_result_comments -->
</div> <!-- code_revision_mainarea_result -->
</div> <!-- code_revision_mainarea -->

1
codepot/src/codepot/views/project_home.php
View File

@ -54,6 +54,7 @@ function render_wiki()
$("#project_home_sidebar_log_all_button").button ().click (function () {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", "/project/log/" + "<?php print $project->id; ?>"));
return false;
});
}

1
codepot/src/codepot/views/site_home.php
View File

@ -60,6 +60,7 @@ $(function () {
$("#site_home_sidebar_log_all_button").button ().click (function () {
$(location).attr ('href', codepot_merge_path("<?php print site_url(); ?>", "/site/log"));
return false;
});
});
</script>

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

@ -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;

6
codepot/src/css/common.css
View File

@ -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;*/