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

updated the code file view to use the title-band class partially

Browse Source
This commit is contained in:
hyung-hwan 2016-01-08 17:51:39 +00:00
parent bd541815a2
commit 6f5815bd9b
2 changed files with 151 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
codepot/src/codepot/views/code_edit.php
View File

@ -37,17 +37,17 @@ var base_return_anchor = codepot_merge_path('<?php print site_url() ?>', '<?php
function resize_editor()
{
var infostrip = $("#code_edit_mainarea_infostrip");
var titleband = $("#code_edit_mainarea_title_band");
var code = $("#code_edit_mainarea_result_code");
var footer = $("#codepot_footer");
var ioff = infostrip.offset();
var ioff = titleband.offset();
var foff = footer.offset();
ioff.top += infostrip.outerHeight() + 5;
ioff.top += titleband.outerHeight() + 5;
code.offset (ioff);
code.innerHeight (foff.top - ioff.top - 5);
code.innerWidth (infostrip.innerWidth());
code.innerWidth (titleband.innerWidth());
}
function show_alert (outputMsg, titleMsg)
@ -266,8 +266,9 @@ $this->load->view (
<div class="mainarea" id="code_edit_mainarea">
<div class="title" id="code_edit_mainarea_title">
<?php
<div class="title-band" id="code_edit_mainarea_title_band">
<div class="title" id="code_edit_mainarea_title">
<?php
print anchor (
"code/${caller}/{$project->id}{$revreqroot}",
htmlspecialchars($project->name));
@ -291,11 +292,10 @@ $this->load->view (
print ' - ';
print htmlspecialchars($file['fullpath']);
}
?>
</div> <!-- code_edit_mainarea_title -->
<div class="infostrip" id="code_edit_mainarea_infostrip">
?>
</div> <!-- code_edit_mainarea_title -->
<div class="actions">
<?php
/* Saving file work on the head only. so the links here don't include the given revision anymore */
print '<select id="code_edit_mainarea_mode"></select>';
@ -304,7 +304,8 @@ $this->load->view (
print ' ';
print anchor ("code/${caller}/{$project->id}/{$hex_headpath}{$revreq}", $this->lang->line('Return'), 'id="code_edit_mainarea_return_button"');
?>
</div>
<div style="clear: both;"></div>
</div>
<div class="result" id="code_edit_mainarea_result">

141
codepot/src/codepot/views/code_file.php
View File

@ -34,23 +34,23 @@ $(function () {
print '$("#code_file_mainarea_result_info").hide();';
?>
if ($("#code_file_mainarea_result_info").is(":visible"))
btn_label = "<?php print $this->lang->line('Hide metadata')?>";
else
btn_label = "<?php print $this->lang->line('Show metadata')?>";
//if ($("#code_file_mainarea_result_info").is(":visible"))
// btn_label = "<?php print $this->lang->line('Hide metadata')?>";
//else
// btn_label = "<?php print $this->lang->line('Show metadata')?>";
btn = $("#code_file_mainarea_metadata_button").button({"label": btn_label}).click (function () {
btn = $("#code_file_mainarea_metadata_button").button().click (function () {
if ($("#code_file_mainarea_result_info").is(":visible"))
{
$("#code_file_mainarea_result_info").hide("blind",{},200);
$("#code_file_mainarea_metadata_button").button(
"option", "label", "<?php print $this->lang->line('Show metadata')?>");
//$("#code_file_mainarea_metadata_button").button(
// "option", "label", "<?php print $this->lang->line('Show metadata')?>");
}
else
{
$("#code_file_mainarea_result_info").show("blind",{},200);
$("#code_file_mainarea_metadata_button").button(
"option", "label", "<?php print $this->lang->line('Hide metadata')?>");
//$("#code_file_mainarea_metadata_button").button(
// "option", "label", "<?php print $this->lang->line('Hide metadata')?>");
}
return false; // prevent the default behavior
@ -124,8 +124,9 @@ $this->load->view (
<div class="mainarea" id="code_file_mainarea">
<div class="title" id="code_file_mainarea_title">
<?php
<div class="title-band" id="code_file_mainarea_title_band">
<div class="title" id="code_file_mainarea_title">
<?php
if ($revision <= 0)
{
$revreq = '';
@ -160,8 +161,49 @@ $this->load->view (
print ' - ';
print htmlspecialchars($file['fullpath']);
}
?>
</div> <!-- code_file_mainarea_title -->
?>
</div> <!-- code_file_mainarea_title -->
<div class="actions">
<?php
print anchor ("code/file/{$project->id}/${xpar}/{$file['prev_rev']}", '<i class="fa fa-arrow-circle-left"></i>');
print ' ';
// anchor to the revision history at the root directory
print anchor (
//"code/revision/{$project->id}/!/{$file['created_rev']}",
"code/revision/{$project->id}/${xpar}/{$file['created_rev']}",
sprintf("%s %s", $this->lang->line('Revision'), $file['created_rev'])
);
if (!empty($file['created_tag']))
{
print ' ';
print ('<span class="left_arrow_indicator">');
print htmlspecialchars($file['created_tag']);
print ('</span>');
}
print ' ';
print anchor ("code/file/{$project->id}/${xpar}/{$file['next_rev']}", '<i class="fa fa-arrow-circle-right"></i>');
print ' | ';
printf ('%s: %s', $this->lang->line('Size'), $file['size']);
if ((isset($login['id']) && $login['id'] != ''))
{
print ' ';
print anchor ("code/edit/{$project->id}/{$xpar}{$revreq}", $this->lang->line('Edit'), 'id="code_file_mainarea_edit_button"');
}
?>
<a id="code_file_mainarea_metadata_button" href='#'><?php print $this->lang->line('Metadata')?></a>
</div>
<div style="clear: both;"></div>
</div>
<div class="menu" id="code_file_mainarea_menu">
<?php
@ -213,44 +255,6 @@ $this->load->view (
?>
</div> <!-- code_file_mainarea_menu -->
<div class="infostrip" id="code_file_mainarea_infostrip">
<?php
print anchor ("code/file/{$project->id}/${xpar}/{$file['prev_rev']}", '<i class="fa fa-arrow-circle-left"></i>');
print ' ';
// anchor to the revision history at the root directory
print anchor (
//"code/revision/{$project->id}/!/{$file['created_rev']}",
"code/revision/{$project->id}/${xpar}/{$file['created_rev']}",
sprintf("%s %s", $this->lang->line('Revision'), $file['created_rev'])
);
if (!empty($file['created_tag']))
{
print ' ';
print ('<span class="left_arrow_indicator">');
print htmlspecialchars($file['created_tag']);
print ('</span>');
}
print ' ';
print anchor ("code/file/{$project->id}/${xpar}/{$file['next_rev']}", '<i class="fa fa-arrow-circle-right"></i>');
print ' | ';
printf ('%s: %s', $this->lang->line('Size'), $file['size']);
if ((isset($login['id']) && $login['id'] != ''))
{
print ' ';
print anchor ("code/edit/{$project->id}/{$xpar}{$revreq}", $this->lang->line('Edit'), 'id="code_file_mainarea_edit_button"');
}
?>
<a id="code_file_mainarea_metadata_button" href='#'><?php print $this->lang->line('Metadata')?></a>
</div>
<div style="display:none">
<pre id="code_file_mainarea_result_raw">
@ -335,19 +339,19 @@ if ($login['settings'] != NULL &&
</pre>
<div id="code_file_mainarea_result_info" class="infobox">
<div class="title"><?php print $this->lang->line('CODE_COMMIT') ?></div>
<ul>
<li><?php printf ($this->lang->line('CODE_MSG_COMMITTED_BY_ON'), $file['last_author'], $file['time']); ?></li>
</ul>
<div class="title"><?php print $this->lang->line('CODE_COMMIT') ?></div>
<ul>
<li><?php printf ($this->lang->line('CODE_MSG_COMMITTED_BY_ON'), $file['last_author'], $file['time']); ?></li>
</ul>
<div class="title"><?php print $this->lang->line('Message') ?></div>
<pre id="code_file_mainarea_result_info_logmsg" class="pre-wrapped">
<?php print htmlspecialchars ($file['logmsg']) ?>
</pre>
<div class="title"><?php print $this->lang->line('Message') ?></div>
<pre id="code_file_mainarea_result_info_logmsg" class="pre-wrapped">
<?php print htmlspecialchars ($file['logmsg']) ?>
</pre>
<?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0)
{
<?php
if (array_key_exists('properties', $file) && count($file['properties']) > 0)
{
print '<div class="title">';
print $this->lang->line('CODE_PROPERTIES');
print '</div>';
@ -365,17 +369,16 @@ if (array_key_exists('properties', $file) && count($file['properties']) > 0)
print '</li>';
}
print '</ul>';
}
?>
</pre>
}
?>
</pre>
<div class="title">LOC</div>
<?php
<div class="title">LOC</div>
<?php
/* TODO: show this if it's enabled in the user settings */
$graph_url = codepot_merge_path (site_url(), "/code/graph/cloc-file/{$project->id}/{$xpar}{$revreq}");
print "<img src='{$graph_url}' id='code_file_mainarea_result_info_locgraph' />";
?>
?>
</div> <!-- code_file_mainarea_result_info -->